代码生成的d
This commit is contained in:
lin
parent
2bd46fc06c
commit
ebfedb130e
117
doc/province.sql
117
doc/province.sql
|
|
@ -10,7 +10,7 @@ Target Server Type : MYSQL
|
|||
Target Server Version : 50719
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 2020-12-16 21:23:15
|
||||
Date: 2020-12-17 17:41:28
|
||||
*/
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=0;
|
||||
|
|
@ -43,13 +43,13 @@ CREATE TABLE `gen_table` (
|
|||
`form_cols` char(1) DEFAULT '2' COMMENT '表单列示 1单列 2两列 3三列 4四列',
|
||||
`bill_prefix` char(20) DEFAULT '' COMMENT '表单前缀编号',
|
||||
PRIMARY KEY (`table_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8 COMMENT='代码生成业务表';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8 COMMENT='代码生成业务表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of gen_table
|
||||
-- ----------------------------
|
||||
INSERT INTO `gen_table` VALUES ('20', 'platf_econ_type', '经济类型', null, null, 'EconType', 'crud', 'com.ruoyi.province.platform', 'platform', 'econtype', '经济类型', 'dalin', '0', '/', '{\"parentMenuId\":\"2001\",\"treeName\":\"\",\"treeParentCode\":\"\",\"parentMenuName\":\"基础设置\",\"treeCode\":\"\"}', 'admin', '2020-12-09 08:52:02', '', '2020-12-16 20:36:45', '', '2', '');
|
||||
INSERT INTO `gen_table` VALUES ('39', 'platf_nation', '民族资料', null, null, 'Nation', 'crud', 'com.ruoyi.province.platform', 'platform', 'nation', '民族资料', 'dalin', '0', '/', '{\"parentMenuId\":\"\",\"treeName\":\"\",\"treeParentCode\":\"\",\"parentMenuName\":\"\",\"treeCode\":\"\"}', 'admin', '2020-12-16 20:30:08', '', '2020-12-16 20:57:45', '', '2', '');
|
||||
INSERT INTO `gen_table` VALUES ('20', 'platf_econ_type', '经济类型', null, null, 'EconType', 'crud', 'com.ruoyi.province.platform', 'platform', 'econtype', '经济类型', 'dalin', '0', '/', '{\"parentMenuId\":\"2001\",\"treeName\":\"\",\"treeParentCode\":\"\",\"parentMenuName\":\"基础设置\",\"treeCode\":\"\"}', 'admin', '2020-12-09 08:52:02', '', '2020-12-17 10:53:38', '', '2', '');
|
||||
INSERT INTO `gen_table` VALUES ('40', 'sys_relev_table', '代码生成业务_关联表', null, null, 'RelevTable', 'crud', 'com.ruoyi.system', 'system', 'relevtable', '关联实体维护', 'dalin', '0', '/', '{\"parentMenuId\":\"3\",\"treeName\":\"\",\"treeParentCode\":\"\",\"parentMenuName\":\"系统工具\",\"treeCode\":\"\"}', 'admin', '2020-12-17 10:56:20', '', '2020-12-17 11:12:32', '', '1', '00001A');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for gen_table_column
|
||||
|
|
@ -79,34 +79,37 @@ CREATE TABLE `gen_table_column` (
|
|||
`update_by` varchar(64) DEFAULT '' COMMENT '更新者',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`is_readonly` char(1) DEFAULT NULL COMMENT '是否自读字段（0否 1是）',
|
||||
`pop_out` varchar(100) DEFAULT NULL COMMENT '弹框',
|
||||
`is_repeat_control` char(1) DEFAULT NULL COMMENT '控制名称重复',
|
||||
`relev_entity` varchar(100) DEFAULT NULL COMMENT '关联实体',
|
||||
PRIMARY KEY (`column_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=278 DEFAULT CHARSET=utf8 COMMENT='代码生成业务表字段';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=291 DEFAULT CHARSET=utf8 COMMENT='代码生成业务表字段';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of gen_table_column
|
||||
-- ----------------------------
|
||||
INSERT INTO `gen_table_column` VALUES ('92', '20', 'econ_id', '主键', 'int(11)', 'Long', 'econId', '1', '1', null, '1', null, null, null, 'EQ', 'input', '', '1', 'admin', '2020-12-09 08:52:02', null, '2020-12-16 20:36:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('93', '20', 'econ_name', '名称', 'varchar(30)', 'String', 'econName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', '2', 'admin', '2020-12-09 08:52:02', null, '2020-12-16 20:36:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('94', '20', 'doc_num', '单据号', 'varchar(25)', 'String', 'docNum', '0', '0', '1', '1', '1', '1', null, 'EQ', 'input', '', '3', 'admin', '2020-12-09 08:52:02', null, '2020-12-16 20:36:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('95', '20', 'status', '资料状态', 'char(1)', 'String', 'status', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'radio', 'platf_doc_statu', '4', 'admin', '2020-12-09 08:52:02', null, '2020-12-16 20:36:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('96', '20', 'remark', '备注', 'varchar(512)', 'String', 'remark', '0', '0', null, '1', '1', '1', null, 'EQ', 'textarea', '', '5', 'admin', '2020-12-09 08:52:02', null, '2020-12-16 20:36:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('97', '20', 'del_flag', '删除标志 删除标志', 'char(1)', 'String', 'delFlag', '0', '0', '1', '1', null, null, null, 'EQ', '', '', '6', 'admin', '2020-12-09 08:52:40', null, '2020-12-16 20:36:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('98', '20', 'create_by', '制单人', 'varchar(30)', 'String', 'createBy', '0', '0', '1', '1', '1', '1', null, 'EQ', 'input', '', '7', 'admin', '2020-12-09 08:52:40', null, '2020-12-16 20:36:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('99', '20', 'create_time', '制单时间', 'datetime', 'Date', 'createTime', '0', '0', '1', '1', '1', '1', null, 'EQ', 'datetime', '', '8', 'admin', '2020-12-09 08:52:40', null, '2020-12-16 20:36:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('100', '20', 'update_by', '修改人', 'varchar(30)', 'String', 'updateBy', '0', '0', null, '1', '1', '1', null, 'EQ', 'input', '', '9', 'admin', '2020-12-09 08:52:40', null, '2020-12-16 20:36:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('101', '20', 'update_time', '修改时间', 'datetime', 'Date', 'updateTime', '0', '0', null, '1', '1', '1', null, 'EQ', 'datetime', '', '10', 'admin', '2020-12-09 08:52:40', null, '2020-12-16 20:36:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('267', '39', 'nation_id', '主键', 'bigint(20)', 'Long', 'nationId', '1', '1', null, '1', null, null, null, 'EQ', 'input', '', '1', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('268', '39', 'nation_name', '名称', 'varchar(30)', 'String', 'nationName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', '2', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('269', '39', 'nation_custom_num', '自定义编号', 'varchar(10)', 'String', 'nationCustomNum', '0', '0', null, null, null, null, null, 'EQ', 'input', '', '3', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('270', '39', 'doc_num', '单据号', 'varchar(25)', 'String', 'docNum', '0', '0', null, '1', '1', '1', '1', 'EQ', 'input', '', '4', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('271', '39', 'status', '资料状态 0有效 1无效', 'char(1)', 'String', 'status', '0', '0', null, '1', '1', '1', '1', 'EQ', 'radio', '', '5', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('272', '39', 'remark', '备注', 'varchar(512)', 'String', 'remark', '0', '0', null, '1', '1', '1', null, 'EQ', 'textarea', '', '6', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', null, null);
|
||||
INSERT INTO `gen_table_column` VALUES ('273', '39', 'del_flag', '删除标志 删除标志（0代表存在 2代表删除）', 'char(1)', 'String', 'delFlag', '0', '0', null, '1', null, null, null, 'EQ', '', '', '7', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('274', '39', 'create_by', '制单人', 'varchar(30)', 'String', 'createBy', '0', '0', null, '1', '1', null, null, 'EQ', 'input', '', '8', 'admin', '2020-12-16 20:30:08', null, '2020-12-16 20:57:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('275', '39', 'create_time', '制单时间', 'datetime', 'Date', 'createTime', '0', '0', null, '1', '1', null, null, 'EQ', 'input', '', '9', 'admin', '2020-12-16 20:30:16', null, '2020-12-16 20:57:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('276', '39', 'update_by', '修改人', 'varchar(30)', 'String', 'updateBy', '0', '0', null, '1', '1', null, null, 'EQ', 'input', '', '10', 'admin', '2020-12-16 20:30:16', null, '2020-12-16 20:57:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('277', '39', 'update_time', '修改时间', 'datetime', 'Date', 'updateTime', '0', '0', null, '1', '1', null, null, 'EQ', 'input', '', '11', 'admin', '2020-12-16 20:30:27', null, '2020-12-16 20:57:45', '1', null);
|
||||
INSERT INTO `gen_table_column` VALUES ('92', '20', 'econ_id', '主键', 'int(11)', 'Long', 'econId', '1', '1', null, '1', null, null, null, 'EQ', 'input', '', '1', 'admin', '2020-12-09 08:52:02', null, '2020-12-17 10:53:38', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('93', '20', 'econ_name', '名称', 'varchar(30)', 'String', 'econName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', '2', 'admin', '2020-12-09 08:52:02', null, '2020-12-17 10:53:38', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('94', '20', 'doc_num', '单据号', 'varchar(25)', 'String', 'docNum', '0', '0', '1', '1', '1', '1', null, 'EQ', 'input', '', '3', 'admin', '2020-12-09 08:52:02', null, '2020-12-17 10:53:38', '1', null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('95', '20', 'status', '资料状态', 'char(1)', 'String', 'status', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'radio', 'platf_doc_statu', '4', 'admin', '2020-12-09 08:52:02', null, '2020-12-17 10:53:38', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('96', '20', 'remark', '备注', 'varchar(512)', 'String', 'remark', '0', '0', null, '1', '1', '1', null, 'EQ', 'textarea', '', '5', 'admin', '2020-12-09 08:52:02', null, '2020-12-17 10:53:38', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('97', '20', 'del_flag', '删除标志 删除标志', 'char(1)', 'String', 'delFlag', '0', '0', '1', '1', null, null, null, 'EQ', '', '', '6', 'admin', '2020-12-09 08:52:40', null, '2020-12-17 10:53:38', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('98', '20', 'create_by', '制单人', 'varchar(30)', 'String', 'createBy', '0', '0', '1', '1', '1', '1', null, 'EQ', 'input', '', '7', 'admin', '2020-12-09 08:52:40', null, '2020-12-17 10:53:38', '1', null, 'SysUser');
|
||||
INSERT INTO `gen_table_column` VALUES ('99', '20', 'create_time', '制单时间', 'datetime', 'Date', 'createTime', '0', '0', '1', '1', '1', '1', null, 'EQ', 'input', '', '8', 'admin', '2020-12-09 08:52:40', null, '2020-12-17 10:53:38', '1', null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('100', '20', 'update_by', '修改人', 'varchar(30)', 'String', 'updateBy', '0', '0', null, '1', '1', '1', null, 'EQ', 'input', '', '9', 'admin', '2020-12-09 08:52:40', null, '2020-12-17 10:53:38', '1', null, 'SysUser');
|
||||
INSERT INTO `gen_table_column` VALUES ('101', '20', 'update_time', '修改时间', 'datetime', 'Date', 'updateTime', '0', '0', null, '1', '1', '1', null, 'EQ', 'input', '', '10', 'admin', '2020-12-09 08:52:40', null, '2020-12-17 10:53:38', '1', null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('278', '40', 'relev_id', '主键', 'bigint(20)', 'Long', 'relevId', '1', '1', null, '1', null, null, null, 'EQ', 'input', '', '1', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('279', '40', 'relev_name', '表单名称', 'varchar(50)', 'String', 'relevName', '0', '0', null, '1', '1', '1', '1', 'LIKE', 'input', '', '2', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('280', '40', 'relev_entity', '弹框', 'varchar(100)', 'String', 'relevEntity', '0', '0', null, '1', '1', '1', '1', 'EQ', 'input', '', '3', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('281', '40', 'relev_entity_id', '', 'varchar(100)', 'String', 'relevEntityId', '0', '0', null, '1', '1', '1', '1', 'EQ', 'input', '', '4', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('282', '40', 'relev_entity_name', '', 'varchar(100)', 'String', 'relevEntityName', '0', '0', null, '1', '1', '1', '1', 'LIKE', 'input', '', '5', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('283', '40', 'is_default_value', '默认值（1是）', 'char(1)', 'String', 'isDefaultValue', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', '6', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('284', '40', 'relev_table', '弹框', 'varchar(100)', 'String', 'relevTable', '0', '0', null, '1', '1', '1', '1', 'EQ', 'input', '', '7', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('285', '40', 'relev_table_id', '', 'varchar(100)', 'String', 'relevTableId', '0', '0', null, '1', '1', '1', '1', 'EQ', 'input', '', '8', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('286', '40', 'relev_table_name', '', 'varchar(100)', 'String', 'relevTableName', '0', '0', null, '1', '1', '1', '1', 'LIKE', 'input', '', '9', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', null, null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('287', '40', 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', null, '1', null, null, null, 'EQ', 'input', '', '10', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', '1', null, 'SysUser');
|
||||
INSERT INTO `gen_table_column` VALUES ('288', '40', 'create_time', '创建时间', 'datetime', 'String', 'createTime', '0', '0', null, '1', null, null, null, 'EQ', 'input', '', '11', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', '1', null, '');
|
||||
INSERT INTO `gen_table_column` VALUES ('289', '40', 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', null, '1', null, null, null, 'EQ', 'input', '', '12', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', '1', null, 'SysUser');
|
||||
INSERT INTO `gen_table_column` VALUES ('290', '40', 'update_time', '更新时间', 'datetime', 'String', 'updateTime', '0', '0', null, '1', null, null, null, 'EQ', 'input', '', '13', 'admin', '2020-12-17 10:56:20', null, '2020-12-17 11:12:32', '1', null, '');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for kid_score
|
||||
|
|
@ -319,7 +322,7 @@ CREATE TABLE `qrtz_scheduler_state` (
|
|||
-- ----------------------------
|
||||
-- Records of qrtz_scheduler_state
|
||||
-- ----------------------------
|
||||
INSERT INTO `qrtz_scheduler_state` VALUES ('RuoyiScheduler', 'linkuaisheng1608123385679', '1608124993993', '15000');
|
||||
INSERT INTO `qrtz_scheduler_state` VALUES ('RuoyiScheduler', 'linkuaisheng1608197296344', '1608197390489', '15000');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for qrtz_simple_triggers
|
||||
|
|
@ -396,9 +399,9 @@ CREATE TABLE `qrtz_triggers` (
|
|||
-- ----------------------------
|
||||
-- Records of qrtz_triggers
|
||||
-- ----------------------------
|
||||
INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME1', 'DEFAULT', 'TASK_CLASS_NAME1', 'DEFAULT', null, '1608123390000', '-1', '5', 'PAUSED', 'CRON', '1608123385000', '0', null, '2', '');
|
||||
INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME2', 'DEFAULT', 'TASK_CLASS_NAME2', 'DEFAULT', null, '1608123390000', '-1', '5', 'PAUSED', 'CRON', '1608123386000', '0', null, '2', '');
|
||||
INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME3', 'DEFAULT', 'TASK_CLASS_NAME3', 'DEFAULT', null, '1608123400000', '-1', '5', 'PAUSED', 'CRON', '1608123386000', '0', null, '2', '');
|
||||
INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME1', 'DEFAULT', 'TASK_CLASS_NAME1', 'DEFAULT', null, '1608197300000', '-1', '5', 'PAUSED', 'CRON', '1608197296000', '0', null, '2', '');
|
||||
INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME2', 'DEFAULT', 'TASK_CLASS_NAME2', 'DEFAULT', null, '1608197310000', '-1', '5', 'PAUSED', 'CRON', '1608197296000', '0', null, '2', '');
|
||||
INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME3', 'DEFAULT', 'TASK_CLASS_NAME3', 'DEFAULT', null, '1608197300000', '-1', '5', 'PAUSED', 'CRON', '1608197296000', '0', null, '2', '');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_bill_no
|
||||
|
|
@ -638,7 +641,7 @@ CREATE TABLE `sys_logininfor` (
|
|||
`msg` varchar(255) DEFAULT '' COMMENT '提示消息',
|
||||
`login_time` datetime DEFAULT NULL COMMENT '访问时间',
|
||||
PRIMARY KEY (`info_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=199 DEFAULT CHARSET=utf8 COMMENT='系统访问记录';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=utf8 COMMENT='系统访问记录';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of sys_logininfor
|
||||
|
|
@ -742,6 +745,8 @@ INSERT INTO `sys_logininfor` VALUES ('195', 'admin', '127.0.0.1', '内网IP', 'C
|
|||
INSERT INTO `sys_logininfor` VALUES ('196', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-16 15:12:57');
|
||||
INSERT INTO `sys_logininfor` VALUES ('197', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-16 15:40:18');
|
||||
INSERT INTO `sys_logininfor` VALUES ('198', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-16 16:16:05');
|
||||
INSERT INTO `sys_logininfor` VALUES ('199', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-17 08:35:23');
|
||||
INSERT INTO `sys_logininfor` VALUES ('200', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-17 09:23:12');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_menu
|
||||
|
|
@ -766,7 +771,7 @@ CREATE TABLE `sys_menu` (
|
|||
`bill_prefix` char(20) DEFAULT '' COMMENT '表单前缀编号',
|
||||
`entity_id` char(30) DEFAULT '' COMMENT '实体标识',
|
||||
PRIMARY KEY (`menu_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=2062 DEFAULT CHARSET=utf8 COMMENT='菜单权限表';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=2068 DEFAULT CHARSET=utf8 COMMENT='菜单权限表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of sys_menu
|
||||
|
|
@ -870,6 +875,12 @@ INSERT INTO `sys_menu` VALUES ('2058', '单据号迭代信息新增', '2056', '2
|
|||
INSERT INTO `sys_menu` VALUES ('2059', '单据号迭代信息修改', '2056', '3', '#', '', 'F', '0', 'config:no:edit', '#', 'admin', '2020-12-14 20:58:36', '', null, '', '', '');
|
||||
INSERT INTO `sys_menu` VALUES ('2060', '单据号迭代信息删除', '2056', '4', '#', '', 'F', '0', 'config:no:remove', '#', 'admin', '2020-12-14 20:58:36', '', null, '', '', '');
|
||||
INSERT INTO `sys_menu` VALUES ('2061', '单据号迭代信息导出', '2056', '5', '#', '', 'F', '0', 'config:no:export', '#', 'admin', '2020-12-14 20:58:36', '', null, '', '', '');
|
||||
INSERT INTO `sys_menu` VALUES ('2062', '关联实体维护', '3', '1', '/system/relevtable', '', 'C', '0', 'system:relevtable:view', '#', 'admin', '2020-12-17 11:18:41', '', null, '关联实体维护菜单', '${billPrefix}', 'relevTable');
|
||||
INSERT INTO `sys_menu` VALUES ('2063', '关联实体维护查询', '2062', '1', '#', '', 'F', '0', 'system:relevtable:list', '#', 'admin', '2020-12-17 11:18:41', '', null, '', '', '');
|
||||
INSERT INTO `sys_menu` VALUES ('2064', '关联实体维护新增', '2062', '2', '#', '', 'F', '0', 'system:relevtable:add', '#', 'admin', '2020-12-17 11:18:41', '', null, '', '', '');
|
||||
INSERT INTO `sys_menu` VALUES ('2065', '关联实体维护修改', '2062', '3', '#', '', 'F', '0', 'system:relevtable:edit', '#', 'admin', '2020-12-17 11:18:41', '', null, '', '', '');
|
||||
INSERT INTO `sys_menu` VALUES ('2066', '关联实体维护删除', '2062', '4', '#', '', 'F', '0', 'system:relevtable:remove', '#', 'admin', '2020-12-17 11:18:41', '', null, '', '', '');
|
||||
INSERT INTO `sys_menu` VALUES ('2067', '关联实体维护导出', '2062', '5', '#', '', 'F', '0', 'system:relevtable:export', '#', 'admin', '2020-12-17 11:18:41', '', null, '', '', '');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_notice
|
||||
|
|
@ -917,7 +928,7 @@ CREATE TABLE `sys_oper_log` (
|
|||
`error_msg` varchar(2000) DEFAULT '' COMMENT '错误消息',
|
||||
`oper_time` datetime DEFAULT NULL COMMENT '操作时间',
|
||||
PRIMARY KEY (`oper_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=338 DEFAULT CHARSET=utf8 COMMENT='操作日志记录';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=346 DEFAULT CHARSET=utf8 COMMENT='操作日志记录';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of sys_oper_log
|
||||
|
|
@ -1160,6 +1171,14 @@ INSERT INTO `sys_oper_log` VALUES ('334', '代码生成', '2', 'com.ruoyi.genera
|
|||
INSERT INTO `sys_oper_log` VALUES ('335', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_nation', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-16 20:38:37');
|
||||
INSERT INTO `sys_oper_log` VALUES ('336', '代码生成', '2', 'com.ruoyi.generator.controller.GenController.editSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"39\"],\"tableName\":[\"platf_nation\"],\"tableComment\":[\"民族资料\"],\"className\":[\"Nation\"],\"functionAuthor\":[\"dalin\"],\"remark\":[\"\"],\"formCols\":[\"2\"],\"billPrefix\":[\"\"],\"columns[0].columnId\":[\"267\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"主键\"],\"columns[0].javaType\":[\"Long\"],\"columns[0].javaField\":[\"nationId\"],\"columns[0].isInsert\":[\"1\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[1].columnId\":[\"268\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"名称\"],\"columns[1].javaType\":[\"String\"],\"columns[1].javaField\":[\"nationName\"],\"columns[1].isInsert\":[\"1\"],\"columns[1].isEdit\":[\"1\"],\"columns[1].isList\":[\"1\"],\"columns[1].isQuery\":[\"1\"],\"columns[1].queryType\":[\"LIKE\"],\"columns[1].isRequired\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[2].columnId\":[\"269\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"自定义编号\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"nationCustomNum\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[3].columnId\":[\"270\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"单据号\"],\"columns[3].javaType\":[\"String\"],\"columns[3].javaField\":[\"docNum\"],\"columns[3].isInsert\":[\"1\"],\"columns[3].isEdit\":[\"1\"],\"columns[3].isList\":[\"1\"],\"columns[3].isQuery\":[\"1\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].isReadonly\":[\"1\"],\"columns[3].htmlType\":[\"input\"],\"columns[3].dictType\":[\"\"],\"columns[4].columnId\":[\"271\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"资料状态 0有效 1无效\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"status\"],\"columns[4].isInsert\":[\"1\"],\"columns[4].isEdit\":[\"1\"],\"columns[4].isList\":[\"1\"],\"columns[4].isQuery\":[\"1\"],\"columns[4].queryType\":[\"EQ\"],\"columns[4].htmlType\":[\"radio\"],\"columns[4].dictType\":[\"\"],\"columns[5].columnId\":[\"272\"],\"columns[5].sort\":[\"6\"],\"columns[5].columnComment\":[\"备注\"],\"columns[5].javaType\":[\"String\"],\"columns[5].javaField\":[\"remark\"],\"columns[5].isIns', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-16 20:57:45');
|
||||
INSERT INTO `sys_oper_log` VALUES ('337', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_nation', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-16 20:58:04');
|
||||
INSERT INTO `sys_oper_log` VALUES ('338', '代码生成', '2', 'com.ruoyi.generator.controller.GenController.editSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"20\"],\"tableName\":[\"platf_econ_type\"],\"tableComment\":[\"经济类型\"],\"className\":[\"EconType\"],\"functionAuthor\":[\"dalin\"],\"remark\":[\"\"],\"formCols\":[\"2\"],\"billPrefix\":[\"\"],\"columns[0].columnId\":[\"92\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"主键\"],\"columns[0].javaType\":[\"Long\"],\"columns[0].javaField\":[\"econId\"],\"columns[0].isInsert\":[\"1\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[0].relevTable\":[\"\"],\"columns[0].relevTableId\":[\"\"],\"columns[0].relevTableName\":[\"\"],\"columns[1].columnId\":[\"93\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"名称\"],\"columns[1].javaType\":[\"String\"],\"columns[1].javaField\":[\"econName\"],\"columns[1].isInsert\":[\"1\"],\"columns[1].isEdit\":[\"1\"],\"columns[1].isList\":[\"1\"],\"columns[1].isQuery\":[\"1\"],\"columns[1].queryType\":[\"LIKE\"],\"columns[1].isRequired\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevTable\":[\"\"],\"columns[1].relevTableId\":[\"\"],\"columns[1].relevTableName\":[\"\"],\"columns[2].columnId\":[\"94\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"单据号\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"docNum\"],\"columns[2].isInsert\":[\"1\"],\"columns[2].isEdit\":[\"1\"],\"columns[2].isList\":[\"1\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].isRequired\":[\"1\"],\"columns[2].isReadonly\":[\"1\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[2].relevTable\":[\"\"],\"columns[2].relevTableId\":[\"\"],\"columns[2].relevTableName\":[\"\"],\"columns[3].columnId\":[\"95\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"资料状态\"],\"columns[3].javaType\":[\"String\"],\"columns[3].javaField\":[\"status\"],\"columns[3].isInsert\":[\"1\"],\"columns[3].isEdit\":[\"1\"],\"columns[3].isList\":[\"1\"],\"columns[3].isQuery\":[\"1\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].isRequired\":[\"1\"],\"columns[3].htmlType\":[\"radio\"],\"columns[3].dictType\":[\"platf_doc_statu\"],\"columns[3].relevTable\":[\"\"],\"columns[3].relevTableId\":[\"\"],\"columns[3].relevTableName\":[\"\"],\"columns[4].columnI', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-17 09:32:33');
|
||||
INSERT INTO `sys_oper_log` VALUES ('339', '代码生成', '2', 'com.ruoyi.generator.controller.GenController.editSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"20\"],\"tableName\":[\"platf_econ_type\"],\"tableComment\":[\"经济类型\"],\"className\":[\"EconType\"],\"functionAuthor\":[\"dalin\"],\"remark\":[\"\"],\"formCols\":[\"2\"],\"billPrefix\":[\"\"],\"columns[0].columnId\":[\"92\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"主键\"],\"columns[0].javaType\":[\"Long\"],\"columns[0].javaField\":[\"econId\"],\"columns[0].isInsert\":[\"1\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[0].relevTable\":[\"\"],\"columns[1].columnId\":[\"93\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"名称\"],\"columns[1].javaType\":[\"String\"],\"columns[1].javaField\":[\"econName\"],\"columns[1].isInsert\":[\"1\"],\"columns[1].isEdit\":[\"1\"],\"columns[1].isList\":[\"1\"],\"columns[1].isQuery\":[\"1\"],\"columns[1].queryType\":[\"LIKE\"],\"columns[1].isRequired\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevTable\":[\"\"],\"columns[2].columnId\":[\"94\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"单据号\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"docNum\"],\"columns[2].isInsert\":[\"1\"],\"columns[2].isEdit\":[\"1\"],\"columns[2].isList\":[\"1\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].isRequired\":[\"1\"],\"columns[2].isReadonly\":[\"1\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[2].relevTable\":[\"\"],\"columns[3].columnId\":[\"95\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"资料状态\"],\"columns[3].javaType\":[\"String\"],\"columns[3].javaField\":[\"status\"],\"columns[3].isInsert\":[\"1\"],\"columns[3].isEdit\":[\"1\"],\"columns[3].isList\":[\"1\"],\"columns[3].isQuery\":[\"1\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].isRequired\":[\"1\"],\"columns[3].htmlType\":[\"radio\"],\"columns[3].dictType\":[\"platf_doc_statu\"],\"columns[3].relevTable\":[\"\"],\"columns[4].columnId\":[\"96\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"备注\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"remark\"],\"columns[4].isInsert\":[\"1\"],\"columns[4].isEdit\":[\"1\"],\"columns[4].isList\":[\"1\"],\"columns[4].queryType\":[\"EQ\"],\"columns[4]', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-17 10:53:15');
|
||||
INSERT INTO `sys_oper_log` VALUES ('340', '代码生成', '2', 'com.ruoyi.generator.controller.GenController.editSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"20\"],\"tableName\":[\"platf_econ_type\"],\"tableComment\":[\"经济类型\"],\"className\":[\"EconType\"],\"functionAuthor\":[\"dalin\"],\"remark\":[\"\"],\"formCols\":[\"2\"],\"billPrefix\":[\"\"],\"columns[0].columnId\":[\"92\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"主键\"],\"columns[0].javaType\":[\"Long\"],\"columns[0].javaField\":[\"econId\"],\"columns[0].isInsert\":[\"1\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[0].relevTable\":[\"\"],\"columns[1].columnId\":[\"93\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"名称\"],\"columns[1].javaType\":[\"String\"],\"columns[1].javaField\":[\"econName\"],\"columns[1].isInsert\":[\"1\"],\"columns[1].isEdit\":[\"1\"],\"columns[1].isList\":[\"1\"],\"columns[1].isQuery\":[\"1\"],\"columns[1].queryType\":[\"LIKE\"],\"columns[1].isRequired\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevTable\":[\"\"],\"columns[2].columnId\":[\"94\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"单据号\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"docNum\"],\"columns[2].isInsert\":[\"1\"],\"columns[2].isEdit\":[\"1\"],\"columns[2].isList\":[\"1\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].isRequired\":[\"1\"],\"columns[2].isReadonly\":[\"1\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[2].relevTable\":[\"\"],\"columns[3].columnId\":[\"95\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"资料状态\"],\"columns[3].javaType\":[\"String\"],\"columns[3].javaField\":[\"status\"],\"columns[3].isInsert\":[\"1\"],\"columns[3].isEdit\":[\"1\"],\"columns[3].isList\":[\"1\"],\"columns[3].isQuery\":[\"1\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].isRequired\":[\"1\"],\"columns[3].htmlType\":[\"radio\"],\"columns[3].dictType\":[\"platf_doc_statu\"],\"columns[3].relevTable\":[\"\"],\"columns[4].columnId\":[\"96\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"备注\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"remark\"],\"columns[4].isInsert\":[\"1\"],\"columns[4].isEdit\":[\"1\"],\"columns[4].isList\":[\"1\"],\"columns[4].queryType\":[\"EQ\"],\"columns[4]', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-17 10:53:38');
|
||||
INSERT INTO `sys_oper_log` VALUES ('341', '代码生成', '3', 'com.ruoyi.generator.controller.GenController.remove()', 'POST', '1', 'admin', '研发部门', '/tool/gen/remove', '127.0.0.1', '内网IP', '{\"ids\":[\"39\"]}', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-17 10:53:53');
|
||||
INSERT INTO `sys_oper_log` VALUES ('342', '代码生成', '6', 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/importTable', '127.0.0.1', '内网IP', '{\"tables\":[\"sys_relev_table\"]}', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-17 10:56:20');
|
||||
INSERT INTO `sys_oper_log` VALUES ('343', '代码生成', '2', 'com.ruoyi.generator.controller.GenController.editSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"40\"],\"tableName\":[\"sys_relev_table\"],\"tableComment\":[\"代码生成业务_关联表\"],\"className\":[\"RelevTable\"],\"functionAuthor\":[\"dalin\"],\"remark\":[\"\"],\"formCols\":[\"1\"],\"billPrefix\":[\"00001A\"],\"columns[0].columnId\":[\"278\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"主键\"],\"columns[0].javaType\":[\"Long\"],\"columns[0].javaField\":[\"relevId\"],\"columns[0].isInsert\":[\"1\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[0].relevTable\":[\"\"],\"columns[1].columnId\":[\"279\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"表单名称\"],\"columns[1].javaType\":[\"String\"],\"columns[1].javaField\":[\"relevName\"],\"columns[1].isInsert\":[\"1\"],\"columns[1].isEdit\":[\"1\"],\"columns[1].isList\":[\"1\"],\"columns[1].isQuery\":[\"1\"],\"columns[1].queryType\":[\"LIKE\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevTable\":[\"\"],\"columns[2].columnId\":[\"280\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"弹框\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"relevEntity\"],\"columns[2].isInsert\":[\"1\"],\"columns[2].isEdit\":[\"1\"],\"columns[2].isList\":[\"1\"],\"columns[2].isQuery\":[\"1\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[2].relevTable\":[\"\"],\"columns[3].columnId\":[\"281\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"\"],\"columns[3].javaType\":[\"String\"],\"columns[3].javaField\":[\"relevEntityId\"],\"columns[3].isInsert\":[\"1\"],\"columns[3].isEdit\":[\"1\"],\"columns[3].isList\":[\"1\"],\"columns[3].isQuery\":[\"1\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].htmlType\":[\"input\"],\"columns[3].dictType\":[\"\"],\"columns[3].relevTable\":[\"\"],\"columns[4].columnId\":[\"282\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"relevEntityName\"],\"columns[4].isInsert\":[\"1\"],\"columns[4].isEdit\":[\"1\"],\"columns[4].isList\":[\"1\"],\"columns[4].isQuery\":[\"1\"],\"columns[4].queryType\":[\"LIKE\"],\"columns[4].htmlType\":[\"input\"],\"columns[4].dictType\"', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-17 11:11:41');
|
||||
INSERT INTO `sys_oper_log` VALUES ('344', '代码生成', '2', 'com.ruoyi.generator.controller.GenController.editSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"40\"],\"tableName\":[\"sys_relev_table\"],\"tableComment\":[\"代码生成业务_关联表\"],\"className\":[\"RelevTable\"],\"functionAuthor\":[\"dalin\"],\"remark\":[\"\"],\"formCols\":[\"1\"],\"billPrefix\":[\"00001A\"],\"columns[0].columnId\":[\"278\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"主键\"],\"columns[0].javaType\":[\"Long\"],\"columns[0].javaField\":[\"relevId\"],\"columns[0].isInsert\":[\"1\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[0].relevTable\":[\"\"],\"columns[1].columnId\":[\"279\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"表单名称\"],\"columns[1].javaType\":[\"String\"],\"columns[1].javaField\":[\"relevName\"],\"columns[1].isInsert\":[\"1\"],\"columns[1].isEdit\":[\"1\"],\"columns[1].isList\":[\"1\"],\"columns[1].isQuery\":[\"1\"],\"columns[1].queryType\":[\"LIKE\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevTable\":[\"\"],\"columns[2].columnId\":[\"280\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"弹框\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"relevEntity\"],\"columns[2].isInsert\":[\"1\"],\"columns[2].isEdit\":[\"1\"],\"columns[2].isList\":[\"1\"],\"columns[2].isQuery\":[\"1\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[2].relevTable\":[\"\"],\"columns[3].columnId\":[\"281\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"\"],\"columns[3].javaType\":[\"String\"],\"columns[3].javaField\":[\"relevEntityId\"],\"columns[3].isInsert\":[\"1\"],\"columns[3].isEdit\":[\"1\"],\"columns[3].isList\":[\"1\"],\"columns[3].isQuery\":[\"1\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].htmlType\":[\"input\"],\"columns[3].dictType\":[\"\"],\"columns[3].relevTable\":[\"\"],\"columns[4].columnId\":[\"282\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"relevEntityName\"],\"columns[4].isInsert\":[\"1\"],\"columns[4].isEdit\":[\"1\"],\"columns[4].isList\":[\"1\"],\"columns[4].isQuery\":[\"1\"],\"columns[4].queryType\":[\"LIKE\"],\"columns[4].htmlType\":[\"input\"],\"columns[4].dictType\"', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-17 11:12:32');
|
||||
INSERT INTO `sys_oper_log` VALUES ('345', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/sys_relev_table', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-17 11:13:51');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_post
|
||||
|
|
@ -1187,6 +1206,32 @@ INSERT INTO `sys_post` VALUES ('2', 'se', '项目经理', '2', '0', 'admin', '20
|
|||
INSERT INTO `sys_post` VALUES ('3', 'hr', '人力资源', '3', '0', 'admin', '2020-12-08 07:51:59', '', null, '');
|
||||
INSERT INTO `sys_post` VALUES ('4', 'user', '普通员工', '4', '0', 'admin', '2020-12-08 07:51:59', '', null, '');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_relev_table
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `sys_relev_table`;
|
||||
CREATE TABLE `sys_relev_table` (
|
||||
`relev_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||
`relev_name` varchar(50) DEFAULT NULL COMMENT '表单名称',
|
||||
`relev_entity` varchar(100) DEFAULT NULL COMMENT '弹框',
|
||||
`relev_entity_id` varchar(100) DEFAULT NULL,
|
||||
`relev_entity_name` varchar(100) DEFAULT NULL,
|
||||
`is_default_value` char(1) NOT NULL DEFAULT '0' COMMENT '默认值（1是）',
|
||||
`relev_table` varchar(100) DEFAULT NULL COMMENT '弹框',
|
||||
`relev_table_id` varchar(100) DEFAULT NULL,
|
||||
`relev_table_name` varchar(100) DEFAULT NULL,
|
||||
`create_by` varchar(64) DEFAULT '' COMMENT '创建者',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT '' COMMENT '更新者',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
PRIMARY KEY (`relev_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='代码生成业务_关联表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of sys_relev_table
|
||||
-- ----------------------------
|
||||
INSERT INTO `sys_relev_table` VALUES ('1', '用户管理', 'SysUser', 'loginName', 'userName', '1', 'sys_user', 'login_name', 'user_name', '', null, '', null);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_role
|
||||
-- ----------------------------
|
||||
|
|
@ -1361,7 +1406,7 @@ CREATE TABLE `sys_user` (
|
|||
-- ----------------------------
|
||||
-- Records of sys_user
|
||||
-- ----------------------------
|
||||
INSERT INTO `sys_user` VALUES ('1', '103', 'admin', '平台管理员', '00', '290541200@qq.com', '18258987010', '1', '', '29c67a30398638269fe600f73a054934', '111111', '0', '0', '127.0.0.1', '2020-12-16 16:16:06', '2020-12-08 07:51:59', 'admin', '2020-12-08 07:51:59', '', '2020-12-16 16:16:06', '管理员');
|
||||
INSERT INTO `sys_user` VALUES ('1', '103', 'admin', '平台管理员', '00', '290541200@qq.com', '18258987010', '1', '', '29c67a30398638269fe600f73a054934', '111111', '0', '0', '127.0.0.1', '2020-12-17 09:23:12', '2020-12-08 07:51:59', 'admin', '2020-12-08 07:51:59', '', '2020-12-17 09:23:12', '管理员');
|
||||
INSERT INTO `sys_user` VALUES ('2', '105', 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '8e6d98b90472783cc73c17047ddccf36', '222222', '0', '0', '127.0.0.1', '2020-12-08 07:51:59', '2020-12-08 07:51:59', 'admin', '2020-12-08 07:51:59', '', null, '测试员');
|
||||
|
||||
-- ----------------------------
|
||||
|
|
@ -1386,7 +1431,7 @@ CREATE TABLE `sys_user_online` (
|
|||
-- ----------------------------
|
||||
-- Records of sys_user_online
|
||||
-- ----------------------------
|
||||
INSERT INTO `sys_user_online` VALUES ('2a22253a-0124-474f-9951-554ab5e927e5', 'admin', '研发部门', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', 'on_line', '2020-12-16 20:24:50', '2020-12-16 21:10:17', '1800000');
|
||||
INSERT INTO `sys_user_online` VALUES ('fb7fc50a-fb80-4757-8769-13ace23239d1', 'admin', '研发部门', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', 'on_line', '2020-12-17 10:52:59', '2020-12-17 11:19:06', '1800000');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_user_post
|
||||
|
|
|
|||
|
|
@ -0,0 +1,123 @@
|
|||
package com.ruoyi.web.controller.system;
|
||||
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.system.domain.RelevTable;
|
||||
import com.ruoyi.system.service.IRelevTableService;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 关联实体维护Controller
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-17
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/system/relevtable")
|
||||
public class RelevTableController extends BaseController
|
||||
{
|
||||
private String prefix = "system/relevtable";
|
||||
|
||||
@Autowired
|
||||
private IRelevTableService relevTableService;
|
||||
|
||||
@RequiresPermissions("system:relevtable:view")
|
||||
@GetMapping()
|
||||
public String relevtable()
|
||||
{
|
||||
return prefix + "/relevtable";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询关联实体维护列表
|
||||
*/
|
||||
@RequiresPermissions("system:relevtable:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(RelevTable relevTable)
|
||||
{
|
||||
startPage();
|
||||
List<RelevTable> list = relevTableService.selectRelevTableList(relevTable);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出关联实体维护列表
|
||||
*/
|
||||
@RequiresPermissions("system:relevtable:export")
|
||||
@Log(title = "关联实体维护", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(RelevTable relevTable)
|
||||
{
|
||||
List<RelevTable> list = relevTableService.selectRelevTableList(relevTable);
|
||||
ExcelUtil<RelevTable> util = new ExcelUtil<RelevTable>(RelevTable.class);
|
||||
return util.exportExcel(list, "relevtable");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增关联实体维护
|
||||
*/
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
{
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增保存关联实体维护
|
||||
*/
|
||||
@RequiresPermissions("system:relevtable:add")
|
||||
@Log(title = "关联实体维护", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ResponseBody
|
||||
public AjaxResult addSave(RelevTable relevTable)
|
||||
{
|
||||
return toAjax(relevTableService.insertRelevTable(relevTable));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改关联实体维护
|
||||
*/
|
||||
@GetMapping("/edit/{relevId}")
|
||||
public String edit(@PathVariable("relevId") Long relevId, ModelMap mmap)
|
||||
{
|
||||
RelevTable relevTable = relevTableService.selectRelevTableById(relevId);
|
||||
mmap.put("relevTable", relevTable);
|
||||
return prefix + "/edit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改保存关联实体维护
|
||||
*/
|
||||
@RequiresPermissions("system:relevtable:edit")
|
||||
@Log(title = "关联实体维护", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/edit")
|
||||
@ResponseBody
|
||||
public AjaxResult editSave(RelevTable relevTable)
|
||||
{
|
||||
return toAjax(relevTableService.updateRelevTable(relevTable));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除关联实体维护
|
||||
*/
|
||||
@RequiresPermissions("system:relevtable:remove")
|
||||
@Log(title = "关联实体维护", businessType = BusinessType.DELETE)
|
||||
@PostMapping( "/remove")
|
||||
@ResponseBody
|
||||
public AjaxResult remove(String ids)
|
||||
{
|
||||
return toAjax(relevTableService.deleteRelevTableByIds(ids));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
package com.ruoyi.web.controller.system;
|
||||
|
||||
import java.util.List;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.system.domain.SysBillNo;
|
||||
import com.ruoyi.system.service.ISysBillNoService;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 单据号迭代信息Controller
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-15
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/SysBillNo/bill")
|
||||
public class SysBillNoController extends BaseController
|
||||
{
|
||||
private String prefix = "SysBillNo/bill";
|
||||
|
||||
@Autowired
|
||||
private ISysBillNoService sysBillNoService;
|
||||
|
||||
@RequiresPermissions("SysBillNo:bill:view")
|
||||
@GetMapping()
|
||||
public String bill()
|
||||
{
|
||||
return prefix + "/bill";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单据号迭代信息列表
|
||||
*/
|
||||
@RequiresPermissions("SysBillNo:bill:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(SysBillNo sysBillNo)
|
||||
{
|
||||
startPage();
|
||||
List<SysBillNo> list = sysBillNoService.selectSysBillNoList(sysBillNo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出单据号迭代信息列表
|
||||
*/
|
||||
@RequiresPermissions("SysBillNo:bill:export")
|
||||
@Log(title = "单据号迭代信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(SysBillNo sysBillNo)
|
||||
{
|
||||
List<SysBillNo> list = sysBillNoService.selectSysBillNoList(sysBillNo);
|
||||
ExcelUtil<SysBillNo> util = new ExcelUtil<SysBillNo>(SysBillNo.class);
|
||||
return util.exportExcel(list, "bill");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增单据号迭代信息
|
||||
*/
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
{
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增保存单据号迭代信息
|
||||
*/
|
||||
@RequiresPermissions("SysBillNo:bill:add")
|
||||
@Log(title = "单据号迭代信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ResponseBody
|
||||
public AjaxResult addSave(SysBillNo sysBillNo)
|
||||
{
|
||||
return toAjax(sysBillNoService.insertSysBillNo(sysBillNo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改单据号迭代信息
|
||||
*/
|
||||
@GetMapping("/edit/{fperiod}")
|
||||
public String edit(@PathVariable("fperiod") String fperiod, ModelMap mmap)
|
||||
{
|
||||
SysBillNo sysBillNo = sysBillNoService.selectSysBillNoById(fperiod);
|
||||
mmap.put("sysBillNo", sysBillNo);
|
||||
return prefix + "/edit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改保存单据号迭代信息
|
||||
*/
|
||||
@RequiresPermissions("SysBillNo:bill:edit")
|
||||
@Log(title = "单据号迭代信息", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/edit")
|
||||
@ResponseBody
|
||||
public AjaxResult editSave(SysBillNo sysBillNo)
|
||||
{
|
||||
return toAjax(sysBillNoService.updateSysBillNo(sysBillNo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除单据号迭代信息
|
||||
*/
|
||||
@RequiresPermissions("SysBillNo:bill:remove")
|
||||
@Log(title = "单据号迭代信息", businessType = BusinessType.DELETE)
|
||||
@PostMapping( "/remove")
|
||||
@ResponseBody
|
||||
public AjaxResult remove(String ids)
|
||||
{
|
||||
return toAjax(sysBillNoService.deleteSysBillNoByIds(ids));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('新增单据号迭代信息')" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-bill-add">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label is-required">迭代值：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="iterationValue" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label is-required">下一个值：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="nextValue" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">备注：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="remark" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "SysBillNo/bill"
|
||||
$("#form-bill-add").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/add", $('#form-bill-add').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('修改单据号迭代信息')" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-bill-edit" th:object="${sysBillNo}">
|
||||
<input name="fperiod" th:field="*{fperiod}" type="hidden">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label is-required">迭代值：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="iterationValue" th:field="*{iterationValue}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label is-required">下一个值：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="nextValue" th:field="*{nextValue}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">备注：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="remark" th:field="*{remark}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "SysBillNo/bill";
|
||||
$("#form-bill-edit").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/edit", $('#form-bill-edit').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('新增关联实体维护')" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-relevtable-add">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">表单名称：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevName" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">弹框：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevEntity" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevEntityId" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevEntityName" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label is-required">默认值：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="isDefaultValue" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">弹框：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevTable" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevTableId" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevTableName" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">创建者：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="createBy" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">创建时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="createTime" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">更新者：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="updateBy" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">更新时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="updateTime" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "system/relevtable"
|
||||
$("#form-relevtable-add").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/add", $('#form-relevtable-add').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('修改关联实体维护')" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-relevtable-edit" th:object="${relevTable}">
|
||||
<input name="relevId" th:field="*{relevId}" type="hidden">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">表单名称：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevName" th:field="*{relevName}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">弹框：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevEntity" th:field="*{relevEntity}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevEntityId" th:field="*{relevEntityId}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevEntityName" th:field="*{relevEntityName}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label is-required">默认值：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="isDefaultValue" th:field="*{isDefaultValue}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">弹框：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevTable" th:field="*{relevTable}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevTableId" th:field="*{relevTableId}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="relevTableName" th:field="*{relevTableName}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "system/relevtable";
|
||||
$("#form-relevtable-edit").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/edit", $('#form-relevtable-edit').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||
<head>
|
||||
<th:block th:include="include :: header('单据号迭代信息列表')" />
|
||||
<th:block th:include="include :: header('关联实体维护列表')" />
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
<div class="container-div">
|
||||
|
|
@ -11,12 +11,36 @@
|
|||
<div class="select-list">
|
||||
<ul>
|
||||
<li>
|
||||
<label>迭代值：</label>
|
||||
<input type="text" name="iterationValue"/>
|
||||
<label>表单名称：</label>
|
||||
<input type="text" name="relevName"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>下一个值：</label>
|
||||
<input type="text" name="nextValue"/>
|
||||
<label>弹框：</label>
|
||||
<input type="text" name="relevEntity"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>：</label>
|
||||
<input type="text" name="relevEntityId"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>：</label>
|
||||
<input type="text" name="relevEntityName"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>默认值：</label>
|
||||
<input type="text" name="isDefaultValue"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>弹框：</label>
|
||||
<input type="text" name="relevTable"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>：</label>
|
||||
<input type="text" name="relevTableId"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>：</label>
|
||||
<input type="text" name="relevTableName"/>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||
|
|
@ -28,16 +52,16 @@
|
|||
</div>
|
||||
|
||||
<div class="btn-group-sm" id="toolbar" role="group">
|
||||
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="SysBillNo:bill:add">
|
||||
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:relevtable:add">
|
||||
<i class="fa fa-plus"></i> 添加
|
||||
</a>
|
||||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="SysBillNo:bill:edit">
|
||||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:relevtable:edit">
|
||||
<i class="fa fa-edit"></i> 修改
|
||||
</a>
|
||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="SysBillNo:bill:remove">
|
||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:relevtable:remove">
|
||||
<i class="fa fa-remove"></i> 删除
|
||||
</a>
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="SysBillNo:bill:export">
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:relevtable:export">
|
||||
<i class="fa fa-download"></i> 导出
|
||||
</a>
|
||||
</div>
|
||||
|
|
@ -48,9 +72,9 @@
|
|||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var editFlag = [[${@permission.hasPermi('SysBillNo:bill:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('SysBillNo:bill:remove')}]];
|
||||
var prefix = ctx + "SysBillNo/bill";
|
||||
var editFlag = [[${@permission.hasPermi('system:relevtable:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('system:relevtable:remove')}]];
|
||||
var prefix = ctx + "system/relevtable";
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
|
|
@ -59,39 +83,54 @@
|
|||
updateUrl: prefix + "/edit/{id}",
|
||||
removeUrl: prefix + "/remove",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "单据号迭代信息",
|
||||
modalName: "关联实体维护",
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
field: 'fperiod',
|
||||
title: '期间',
|
||||
field: 'relevId',
|
||||
title: '主键',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'billName',
|
||||
title: '单据标识',
|
||||
visible: false
|
||||
field: 'relevName',
|
||||
title: '表单名称'
|
||||
},
|
||||
{
|
||||
field: 'iterationValue',
|
||||
title: '迭代值'
|
||||
field: 'relevEntity',
|
||||
title: '弹框'
|
||||
},
|
||||
{
|
||||
field: 'nextValue',
|
||||
title: '下一个值'
|
||||
field: 'relevEntityId',
|
||||
title: ''
|
||||
},
|
||||
{
|
||||
field: 'remark',
|
||||
title: '备注'
|
||||
field: 'relevEntityName',
|
||||
title: ''
|
||||
},
|
||||
{
|
||||
field: 'isDefaultValue',
|
||||
title: '默认值'
|
||||
},
|
||||
{
|
||||
field: 'relevTable',
|
||||
title: '弹框'
|
||||
},
|
||||
{
|
||||
field: 'relevTableId',
|
||||
title: ''
|
||||
},
|
||||
{
|
||||
field: 'relevTableName',
|
||||
title: ''
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.fperiod + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.fperiod + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.relevId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.relevId + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
|
|
@ -42,6 +42,9 @@ public class GenConstants
|
|||
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
|
||||
"bit", "bigint", "float", "double", "decimal" };
|
||||
|
||||
/** 制单人、修改人 关联字段 */
|
||||
public static final String[] COLUMNNAME_RELEV_FIELDS = { "create_by","update_by" };
|
||||
|
||||
/** 页面上 默认只读的字段 */
|
||||
public static final String[] COLUMNNAME_INI_READONLY = { "doc_num", "create_by", "create_time", "update_by", "update_time", "del_flag" };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
package com.ruoyi.common.core.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* Entity基类
|
||||
|
|
|
|||
|
|
@ -29,6 +29,12 @@
|
|||
<artifactId>ruoyi-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 系统模块-->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-system</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
package com.ruoyi.generator.domain;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* 代码生成业务字段表 gen_table_column
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public class GenTableColumn extends BaseEntity
|
||||
public class GenTableColumn extends BaseEntity implements Cloneable
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -53,6 +55,39 @@ public class GenTableColumn extends BaseEntity
|
|||
/** 是否 只读字段（1是） */
|
||||
private String isReadonly;
|
||||
|
||||
/** 是否 是否控制名称重复（1是） is_repeat_control */
|
||||
private String isRepeatControl;
|
||||
|
||||
/** 关联字段Id 在页面上要隐藏（1是） */
|
||||
private String isRelevByHidden;
|
||||
|
||||
/** 关联实体 */
|
||||
private String relevEntity;
|
||||
|
||||
/** 关联实体ID */
|
||||
private String relevEntityId;
|
||||
|
||||
/** 关联实体名称 */
|
||||
private String relevEntityName;
|
||||
|
||||
/** 默认值（1是） */
|
||||
private String isDefaultValue;
|
||||
|
||||
|
||||
/** 关联实体名 */
|
||||
private String relevTable ;
|
||||
|
||||
/** 关联表字段ID */
|
||||
private String relevTableId;
|
||||
|
||||
/** 关联表字段名称 */
|
||||
private String relevTableName;
|
||||
|
||||
|
||||
/** 关联实体 别名 */
|
||||
private String relevAlias;
|
||||
|
||||
|
||||
/** 是否列表字段（1是） */
|
||||
private String isList;
|
||||
|
||||
|
|
@ -245,6 +280,106 @@ public class GenTableColumn extends BaseEntity
|
|||
return isReadonly != null && StringUtils.equals("1", isReadonly);
|
||||
}
|
||||
|
||||
public String getIsRelevByHidden() {
|
||||
return isRelevByHidden;
|
||||
}
|
||||
|
||||
public void setIsRelevByHidden(String isRelevByHidden) {
|
||||
this.isRelevByHidden = isRelevByHidden;
|
||||
}
|
||||
|
||||
public boolean isRelevByHidden()
|
||||
{
|
||||
return isRelevByHidden(this.isRelevByHidden);
|
||||
}
|
||||
|
||||
public boolean isRelevByHidden(String isRelevByHidden)
|
||||
{
|
||||
return isRelevByHidden != null && StringUtils.equals("1", isRelevByHidden);
|
||||
}
|
||||
|
||||
public String getRelevAlias() {
|
||||
return relevAlias;
|
||||
}
|
||||
|
||||
public void setRelevAlias(String relevAlias) {
|
||||
this.relevAlias = relevAlias;
|
||||
}
|
||||
|
||||
public String getIsRepeatControl() {
|
||||
return isRepeatControl;
|
||||
}
|
||||
|
||||
public void setIsRepeatControl(String isRepeatControl) {
|
||||
this.isRepeatControl = isRepeatControl;
|
||||
}
|
||||
|
||||
public boolean isRepeatControl()
|
||||
{
|
||||
return isRepeatControl(this.isRepeatControl);
|
||||
}
|
||||
|
||||
public boolean isRepeatControl(String isRepeatControl)
|
||||
{
|
||||
return isRepeatControl != null && StringUtils.equals("1", isRepeatControl);
|
||||
}
|
||||
|
||||
public String getRelevTable() {
|
||||
return relevTable;
|
||||
}
|
||||
|
||||
public void setRelevTable(String relevTable) {
|
||||
this.relevTable = relevTable;
|
||||
}
|
||||
|
||||
public String getRelevEntity() {
|
||||
return relevEntity;
|
||||
}
|
||||
|
||||
public void setRelevEntity(String relevEntity) {
|
||||
this.relevEntity = relevEntity;
|
||||
}
|
||||
|
||||
public String getRelevEntityId() {
|
||||
return relevEntityId;
|
||||
}
|
||||
|
||||
public void setRelevEntityId(String relevEntityId) {
|
||||
this.relevEntityId = relevEntityId;
|
||||
}
|
||||
|
||||
public String getRelevEntityName() {
|
||||
return relevEntityName;
|
||||
}
|
||||
|
||||
public void setRelevEntityName(String relevEntityName) {
|
||||
this.relevEntityName = relevEntityName;
|
||||
}
|
||||
|
||||
public String getIsDefaultValue() {
|
||||
return isDefaultValue;
|
||||
}
|
||||
|
||||
public void setIsDefaultValue(String isDefaultValue) {
|
||||
this.isDefaultValue = isDefaultValue;
|
||||
}
|
||||
|
||||
public String getRelevTableId() {
|
||||
return relevTableId;
|
||||
}
|
||||
|
||||
public void setRelevTableId(String relevTableId) {
|
||||
this.relevTableId = relevTableId;
|
||||
}
|
||||
|
||||
public String getRelevTableName() {
|
||||
return relevTableName;
|
||||
}
|
||||
|
||||
public void setRelevTableName(String relevTableName) {
|
||||
this.relevTableName = relevTableName;
|
||||
}
|
||||
|
||||
public void setIsEdit(String isEdit)
|
||||
{
|
||||
this.isEdit = isEdit;
|
||||
|
|
@ -392,4 +527,15 @@ public class GenTableColumn extends BaseEntity
|
|||
return this.columnComment;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GenTableColumn clone() throws CloneNotSupportedException {
|
||||
return (GenTableColumn)super.clone();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return " [javaField=" + javaField + ", ColumnId=" + columnId + "]";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -363,7 +363,7 @@ public class GenTableServiceImpl implements IGenTableService
|
|||
}
|
||||
}
|
||||
|
||||
// 渲染模板
|
||||
// 渲染模板 SysUser
|
||||
StringWriter sw = new StringWriter();
|
||||
Template tpl = Velocity.getTemplate(template, Constants.UTF8);
|
||||
tpl.merge(context, sw);
|
||||
|
|
|
|||
|
|
@ -87,6 +87,14 @@ public class GenUtils
|
|||
}
|
||||
}
|
||||
|
||||
// 制单人、修改人 关联《用户操作员》Id
|
||||
if (arraysContains(GenConstants.COLUMNNAME_RELEV_FIELDS, columnName) && !column.isPk())
|
||||
{
|
||||
column.setRelevTable("SysUser"); // sys_user
|
||||
// column.setRelevTableId("login_name");
|
||||
// column.setRelevTableName("user_name");
|
||||
}
|
||||
|
||||
// 插入字段（默认所有字段都需要插入）
|
||||
column.setIsInsert(GenConstants.REQUIRE);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,27 @@
|
|||
package com.ruoyi.generator.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.velocity.VelocityContext;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.util.StringUtil;
|
||||
import com.ruoyi.common.constant.GenConstants;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.generator.config.GenConfig;
|
||||
import com.ruoyi.generator.domain.GenTable;
|
||||
import com.ruoyi.generator.domain.GenTableColumn;
|
||||
import com.ruoyi.system.domain.RelevTable;
|
||||
import com.ruoyi.system.service.IRelevTableService;
|
||||
import org.apache.velocity.VelocityContext;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
public class VelocityUtils {
|
||||
|
||||
@Autowired
|
||||
private IRelevTableService relevTableService;
|
||||
|
||||
/**
|
||||
* 项目空间路径
|
||||
*/
|
||||
|
|
@ -66,6 +74,9 @@ public class VelocityUtils {
|
|||
List<GenTableColumn> tempcolumns = genTable.getColumns();
|
||||
List<GenTableColumn> effectivecols = new ArrayList<GenTableColumn>();//定义一个list对象
|
||||
List<GenTableColumn> effectiveceditols = new ArrayList<GenTableColumn>();//定义一个list对象
|
||||
List<GenTableColumn> fieldcols = new ArrayList<GenTableColumn>();// 模板的变量 colums
|
||||
List<GenTableColumn> hiddenfiledcols = new ArrayList<GenTableColumn>();// 模板隐藏变量 hiddenfiledcols
|
||||
|
||||
for (GenTableColumn tcolumn : tempcolumns) {
|
||||
if (tcolumn.isInsert() && !tcolumn.isPk())
|
||||
if (tcolumn.isUsableColumn() || !tcolumn.isSuperColumn())
|
||||
|
|
@ -74,8 +85,34 @@ public class VelocityUtils {
|
|||
if (tcolumn.isEdit() && !tcolumn.isPk())
|
||||
if (tcolumn.isUsableColumn() || !tcolumn.isSuperColumn())
|
||||
effectiveceditols.add(tcolumn);
|
||||
|
||||
if ( !StringUtil.isEmpty( tcolumn.getRelevEntity() ) && !tcolumn.isPk() ) {
|
||||
// 添加 关联字段 信息
|
||||
try {
|
||||
// 取得 关联实体信息
|
||||
GenTableColumn relevColumn = (GenTableColumn) tcolumn.clone();
|
||||
|
||||
RelevTable relevTb =
|
||||
relevTableService.selectRelevTableByRelevEntity( tcolumn.getRelevEntity() ) ;
|
||||
|
||||
relevColumn.setRelevEntityId( relevTb.getRelevEntityId() );
|
||||
relevColumn.setRelevEntityName( relevTb.getRelevEntityName() );
|
||||
relevColumn.setRelevTable(relevTb.getRelevTable());
|
||||
relevColumn.setRelevTableName(relevTb.getRelevTableName());
|
||||
relevColumn.setRelevTableId(relevTb.getRelevTableId());
|
||||
|
||||
fieldcols.add(relevColumn) ;
|
||||
|
||||
}catch (Exception e){
|
||||
|
||||
}
|
||||
;
|
||||
|
||||
tcolumn.setIsRelevByHidden("1");
|
||||
fieldcols.add(tcolumn) ;
|
||||
|
||||
} else
|
||||
fieldcols.add(tcolumn) ;
|
||||
};
|
||||
|
||||
velocityContext.put("effectivecols", effectivecols);
|
||||
velocityContext.put("effectiveeditcols", effectiveceditols);
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="isIncrement" column="is_increment" />
|
||||
<result property="isRequired" column="is_required" />
|
||||
<result property="isReadonly" column="is_readonly" />
|
||||
<result property="relevEntity" column="relev_entity" />
|
||||
<result property="isRepeatControl" column="is_repeat_control" />
|
||||
<result property="isInsert" column="is_insert" />
|
||||
<result property="isEdit" column="is_edit" />
|
||||
<result property="isList" column="is_list" />
|
||||
|
|
@ -31,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectGenTableColumnVo">
|
||||
select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit,is_readonly, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
|
||||
select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit,is_repeat_control,is_readonly,relev_entity,is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
|
||||
</sql>
|
||||
|
||||
<select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
|
||||
|
|
@ -58,6 +60,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
|
||||
<if test="isRequired != null and isRequired != ''">is_required,</if>
|
||||
<if test="isReadonly != null and isReadonly != ''">is_readonly,</if>
|
||||
<if test="isRepeatControl != null and isRepeatControl != ''">is_repeat_control,</if>
|
||||
|
||||
<if test="relevEntity != null and relevEntity != ''">relev_entity,</if>
|
||||
|
||||
<if test="isInsert != null and isInsert != ''">is_insert,</if>
|
||||
<if test="isEdit != null and isEdit != ''">is_edit,</if>
|
||||
<if test="isList != null and isList != ''">is_list,</if>
|
||||
|
|
@ -79,6 +85,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
|
||||
<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
|
||||
<if test="isReadonly != null and isReadonly != ''">#{isReadonly},</if>
|
||||
<if test="isRepeatControl != null and isRepeatControl != ''">#{isRepeatControl},</if>
|
||||
|
||||
<if test="relevEntity != null and relevEntity != ''">#{relevEntity},</if>
|
||||
|
||||
<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
|
||||
<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
|
||||
<if test="isList != null and isList != ''">#{isList},</if>
|
||||
|
|
@ -104,6 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
is_query = #{isQuery},
|
||||
is_required = #{isRequired},
|
||||
is_readonly = #{isReadonly},
|
||||
is_repeat_control = #{isRepeatControl},
|
||||
|
||||
relev_entity = #{relevEntity},
|
||||
|
||||
query_type = #{queryType},
|
||||
html_type = #{htmlType},
|
||||
dict_type = #{dictType},
|
||||
|
|
|
|||
|
|
@ -452,6 +452,16 @@
|
|||
return html;
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'isRepeatControl',
|
||||
title: '重复',
|
||||
width: "6%",
|
||||
formatter: function (value, row, index) {
|
||||
var isCheck = value == 1 ? 'checked' : '';
|
||||
var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isRepeatControl' value='1' %s></label>", index, isCheck);
|
||||
return html;
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'htmlType',
|
||||
title: '显示类型',
|
||||
|
|
@ -474,17 +484,35 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
field: 'popOut',
|
||||
title: '弹框',
|
||||
width: "13%",
|
||||
field: 'relevEntity',
|
||||
title: '关联实体',
|
||||
width: "12%",
|
||||
formatter: function (value, row, index) {
|
||||
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].popOut' value='%s' id='columns_popout_%s'>", index, value, row.columnId);
|
||||
return "<div class='input-group'>" + html + "<span class='input-group-addon input-sm' onclick='selectpopOut(" + row.columnId + ", this)'><i class='fa fa-search'></i></span></div>";
|
||||
},
|
||||
cellStyle: function(value, row, index) {
|
||||
return { css: { "cursor": "default" } };
|
||||
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].relevEntity' value='%s' >", index, value);
|
||||
return html;
|
||||
}
|
||||
}]
|
||||
}
|
||||
/* , {
|
||||
field: 'relevTableId',
|
||||
title: '关联字段ID',
|
||||
width: "12%",
|
||||
formatter: function (value, row, index) {
|
||||
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].relevTableId' value='%s' >", index, value);
|
||||
return html;
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'relevTableName',
|
||||
title: '关联字段名称',
|
||||
width: "12%",
|
||||
formatter: function (value, row, index) {
|
||||
var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].relevTableName' value='%s' >", index, value);
|
||||
return html;
|
||||
}
|
||||
} */
|
||||
|
||||
|
||||
]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
|
|
@ -559,18 +587,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
// 弹框处理函数
|
||||
function selectpopOut(columnId, obj) {
|
||||
var dictType = $.common.nullToStr($(obj).parent().find("input").val());
|
||||
var url = ctx + "system/dict/selectDictTree/" + columnId + "/" + dictType;
|
||||
var options = {
|
||||
title: '选择字典类型',
|
||||
width: "380",
|
||||
url: url,
|
||||
callBack: doDictSubmit
|
||||
};
|
||||
$.modal.openOptions(options);
|
||||
}
|
||||
|
||||
|
||||
// 选择字典处理函数
|
||||
function selectDictTree(columnId, obj) {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,10 @@
|
|||
#if($table.sub)
|
||||
<h4 class="form-header h4">${functionName}信息</h4>
|
||||
#end
|
||||
#set($cumvar=0)
|
||||
<input type="hidden" name="supplierTypeId" id="supplierTypeId" />
|
||||
<input type="hidden" name="unitId" id="unitId" />
|
||||
|
||||
#set($cumvar=0)
|
||||
#set($colcount=$effectivecols.size())
|
||||
#foreach($column in $effectivecols)
|
||||
#if($column.insert && !$column.pk)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,153 @@
|
|||
package com.ruoyi.system.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 关联实体维护对象 sys_relev_table
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-17
|
||||
*/
|
||||
public class RelevTable extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long relevId;
|
||||
|
||||
/** 表单名称 */
|
||||
@Excel(name = "表单名称")
|
||||
private String relevName;
|
||||
|
||||
/** 弹框 */
|
||||
@Excel(name = "关联实体")
|
||||
private String relevEntity;
|
||||
|
||||
/** */
|
||||
@Excel(name = "关联实体ID")
|
||||
private String relevEntityId;
|
||||
|
||||
/** */
|
||||
@Excel(name = "关联实体名称")
|
||||
private String relevEntityName;
|
||||
|
||||
/** 默认值（1是） */
|
||||
@Excel(name = "默认值", readConverterExp = "1=是")
|
||||
private String isDefaultValue;
|
||||
|
||||
/** 弹框 */
|
||||
@Excel(name = "关联表名")
|
||||
private String relevTable;
|
||||
|
||||
/** */
|
||||
@Excel(name = "关联表字段ID")
|
||||
private String relevTableId;
|
||||
|
||||
/** */
|
||||
@Excel(name = "关联表字段名称")
|
||||
private String relevTableName;
|
||||
|
||||
public void setRelevId(Long relevId)
|
||||
{
|
||||
this.relevId = relevId;
|
||||
}
|
||||
|
||||
public Long getRelevId()
|
||||
{
|
||||
return relevId;
|
||||
}
|
||||
public void setRelevName(String relevName)
|
||||
{
|
||||
this.relevName = relevName;
|
||||
}
|
||||
|
||||
public String getRelevName()
|
||||
{
|
||||
return relevName;
|
||||
}
|
||||
public void setRelevEntity(String relevEntity)
|
||||
{
|
||||
this.relevEntity = relevEntity;
|
||||
}
|
||||
|
||||
public String getRelevEntity()
|
||||
{
|
||||
return relevEntity;
|
||||
}
|
||||
public void setRelevEntityId(String relevEntityId)
|
||||
{
|
||||
this.relevEntityId = relevEntityId;
|
||||
}
|
||||
|
||||
public String getRelevEntityId()
|
||||
{
|
||||
return relevEntityId;
|
||||
}
|
||||
public void setRelevEntityName(String relevEntityName)
|
||||
{
|
||||
this.relevEntityName = relevEntityName;
|
||||
}
|
||||
|
||||
public String getRelevEntityName()
|
||||
{
|
||||
return relevEntityName;
|
||||
}
|
||||
public void setIsDefaultValue(String isDefaultValue)
|
||||
{
|
||||
this.isDefaultValue = isDefaultValue;
|
||||
}
|
||||
|
||||
public String getIsDefaultValue()
|
||||
{
|
||||
return isDefaultValue;
|
||||
}
|
||||
public void setRelevTable(String relevTable)
|
||||
{
|
||||
this.relevTable = relevTable;
|
||||
}
|
||||
|
||||
public String getRelevTable()
|
||||
{
|
||||
return relevTable;
|
||||
}
|
||||
public void setRelevTableId(String relevTableId)
|
||||
{
|
||||
this.relevTableId = relevTableId;
|
||||
}
|
||||
|
||||
public String getRelevTableId()
|
||||
{
|
||||
return relevTableId;
|
||||
}
|
||||
public void setRelevTableName(String relevTableName)
|
||||
{
|
||||
this.relevTableName = relevTableName;
|
||||
}
|
||||
|
||||
public String getRelevTableName()
|
||||
{
|
||||
return relevTableName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("relevId", getRelevId())
|
||||
.append("relevName", getRelevName())
|
||||
.append("relevEntity", getRelevEntity())
|
||||
.append("relevEntityId", getRelevEntityId())
|
||||
.append("relevEntityName", getRelevEntityName())
|
||||
.append("isDefaultValue", getIsDefaultValue())
|
||||
.append("relevTable", getRelevTable())
|
||||
.append("relevTableId", getRelevTableId())
|
||||
.append("relevTableName", getRelevTableName())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
package com.ruoyi.system.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 单据号迭代信息对象 sys_bill_no
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-15
|
||||
*/
|
||||
public class SysBillNo extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 期间 */
|
||||
private String fperiod;
|
||||
|
||||
/** 单据标识 */
|
||||
private String billName;
|
||||
|
||||
/** 迭代值 */
|
||||
@Excel(name = "迭代值")
|
||||
private String iterationValue;
|
||||
|
||||
/** 下一个值 */
|
||||
@Excel(name = "下一个值")
|
||||
private String nextValue;
|
||||
|
||||
public void setFperiod(String fperiod)
|
||||
{
|
||||
this.fperiod = fperiod;
|
||||
}
|
||||
|
||||
public String getFperiod()
|
||||
{
|
||||
return fperiod;
|
||||
}
|
||||
public void setBillName(String billName)
|
||||
{
|
||||
this.billName = billName;
|
||||
}
|
||||
|
||||
public String getBillName()
|
||||
{
|
||||
return billName;
|
||||
}
|
||||
public void setIterationValue(String iterationValue)
|
||||
{
|
||||
this.iterationValue = iterationValue;
|
||||
}
|
||||
|
||||
public String getIterationValue()
|
||||
{
|
||||
return iterationValue;
|
||||
}
|
||||
public void setNextValue(String nextValue)
|
||||
{
|
||||
this.nextValue = nextValue;
|
||||
}
|
||||
|
||||
public String getNextValue()
|
||||
{
|
||||
return nextValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("fperiod", getFperiod())
|
||||
.append("billName", getBillName())
|
||||
.append("iterationValue", getIterationValue())
|
||||
.append("nextValue", getNextValue())
|
||||
.append("remark", getRemark())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
package com.ruoyi.system.mapper;
|
||||
|
||||
import com.ruoyi.system.domain.RelevTable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 关联实体维护Mapper接口
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-17
|
||||
*/
|
||||
public interface RelevTableMapper
|
||||
{
|
||||
/**
|
||||
* 查询关联实体维护
|
||||
*
|
||||
* @param relevId 关联实体维护ID
|
||||
* @return 关联实体维护
|
||||
*/
|
||||
public RelevTable selectRelevTableById(Long relevId);
|
||||
|
||||
/**
|
||||
* 查询关联实体维护
|
||||
*
|
||||
* @param relevEntity 关联实体
|
||||
* @return 关联实体维护
|
||||
*/
|
||||
public RelevTable selectRelevTableByRelevEntity(String relevEntity);
|
||||
|
||||
/**
|
||||
* 查询关联实体维护列表
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 关联实体维护集合
|
||||
*/
|
||||
public List<RelevTable> selectRelevTableList(RelevTable relevTable);
|
||||
|
||||
/**
|
||||
* 新增关联实体维护
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertRelevTable(RelevTable relevTable);
|
||||
|
||||
/**
|
||||
* 修改关联实体维护
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateRelevTable(RelevTable relevTable);
|
||||
|
||||
/**
|
||||
* 删除关联实体维护
|
||||
*
|
||||
* @param relevId 关联实体维护ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteRelevTableById(Long relevId);
|
||||
|
||||
/**
|
||||
* 批量删除关联实体维护
|
||||
*
|
||||
* @param relevIds 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteRelevTableByIds(String[] relevIds);
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.SysBillNo;
|
||||
|
||||
/**
|
||||
* 单据号迭代信息Mapper接口
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-15
|
||||
*/
|
||||
public interface SysBillNoMapper
|
||||
{
|
||||
/**
|
||||
* 查询单据号迭代信息
|
||||
*
|
||||
* @param fperiod 单据号迭代信息ID
|
||||
* @return 单据号迭代信息
|
||||
*/
|
||||
public SysBillNo selectSysBillNoById(String fperiod);
|
||||
|
||||
/**
|
||||
* 查询单据号迭代信息列表
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 单据号迭代信息集合
|
||||
*/
|
||||
public List<SysBillNo> selectSysBillNoList(SysBillNo sysBillNo);
|
||||
|
||||
/**
|
||||
* 新增单据号迭代信息
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertSysBillNo(SysBillNo sysBillNo);
|
||||
|
||||
/**
|
||||
* 修改单据号迭代信息
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateSysBillNo(SysBillNo sysBillNo);
|
||||
|
||||
/**
|
||||
* 删除单据号迭代信息
|
||||
*
|
||||
* @param fperiod 单据号迭代信息ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysBillNoById(String fperiod);
|
||||
|
||||
/**
|
||||
* 批量删除单据号迭代信息
|
||||
*
|
||||
* @param fperiods 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysBillNoByIds(String[] fperiods);
|
||||
|
||||
/**
|
||||
* 查询单据前缀是否重复
|
||||
* @param billPrefix
|
||||
* 单据前缀
|
||||
* @return
|
||||
*/
|
||||
public SysBillNo selectSysBillNoByBillPrefix(String billPrefix);
|
||||
}
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
package com.ruoyi.system.service;
|
||||
|
||||
import com.ruoyi.system.domain.RelevTable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 关联实体维护Service接口
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-17
|
||||
*/
|
||||
public interface IRelevTableService
|
||||
{
|
||||
/**
|
||||
* 查询关联实体维护
|
||||
*
|
||||
* @param relevId 关联实体维护ID
|
||||
* @return 关联实体维护
|
||||
*/
|
||||
public RelevTable selectRelevTableById(Long relevId);
|
||||
|
||||
/**
|
||||
* 查询关联实体维护
|
||||
*
|
||||
* @param relevEntity 关联实体维护ID
|
||||
* @return 关联实体维护
|
||||
*/
|
||||
public RelevTable selectRelevTableByRelevEntity(String relevEntity);
|
||||
|
||||
/**
|
||||
* 查询关联实体维护列表
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 关联实体维护集合
|
||||
*/
|
||||
public List<RelevTable> selectRelevTableList(RelevTable relevTable);
|
||||
|
||||
/**
|
||||
* 新增关联实体维护
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertRelevTable(RelevTable relevTable);
|
||||
|
||||
/**
|
||||
* 修改关联实体维护
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateRelevTable(RelevTable relevTable);
|
||||
|
||||
/**
|
||||
* 批量删除关联实体维护
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteRelevTableByIds(String ids);
|
||||
|
||||
/**
|
||||
* 删除关联实体维护信息
|
||||
*
|
||||
* @param relevId 关联实体维护ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteRelevTableById(Long relevId);
|
||||
}
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
package com.ruoyi.system.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.SysBillNo;
|
||||
|
||||
/**
|
||||
* 单据号迭代信息Service接口
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-15
|
||||
*/
|
||||
public interface ISysBillNoService
|
||||
{
|
||||
/**
|
||||
* 查询单据号迭代信息
|
||||
*
|
||||
* @param fperiod 单据号迭代信息ID
|
||||
* @return 单据号迭代信息
|
||||
*/
|
||||
public SysBillNo selectSysBillNoById(String fperiod);
|
||||
|
||||
/**
|
||||
* 查询单据号迭代信息列表
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 单据号迭代信息集合
|
||||
*/
|
||||
public List<SysBillNo> selectSysBillNoList(SysBillNo sysBillNo);
|
||||
|
||||
/**
|
||||
* 新增单据号迭代信息
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertSysBillNo(SysBillNo sysBillNo);
|
||||
|
||||
/**
|
||||
* 修改单据号迭代信息
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateSysBillNo(SysBillNo sysBillNo);
|
||||
|
||||
/**
|
||||
* 批量删除单据号迭代信息
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysBillNoByIds(String ids);
|
||||
|
||||
/**
|
||||
* 删除单据号迭代信息信息
|
||||
*
|
||||
* @param fperiod 单据号迭代信息ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysBillNoById(String fperiod);
|
||||
/***
|
||||
* 查询单据前缀是否存在
|
||||
* @param billPrefix
|
||||
* 单据前缀
|
||||
* @return
|
||||
*/
|
||||
public SysBillNo selectSysBillNoByBillPrefix(String billPrefix);
|
||||
|
||||
/***
|
||||
* 查询指定单据的下一个值
|
||||
* @param billName
|
||||
* 单据标识
|
||||
* @return
|
||||
*/
|
||||
public String selectNextBillNoById(String billName);
|
||||
}
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.system.mapper.RelevTableMapper;
|
||||
import com.ruoyi.system.domain.RelevTable;
|
||||
import com.ruoyi.system.service.IRelevTableService;
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
|
||||
/**
|
||||
* 关联实体维护Service业务层处理
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-17
|
||||
*/
|
||||
@Service
|
||||
public class RelevTableServiceImpl implements IRelevTableService
|
||||
{
|
||||
@Autowired
|
||||
private RelevTableMapper relevTableMapper;
|
||||
|
||||
/**
|
||||
* 查询关联实体维护
|
||||
*
|
||||
* @param relevId 关联实体维护ID
|
||||
* @return 关联实体维护
|
||||
*/
|
||||
@Override
|
||||
public RelevTable selectRelevTableById(Long relevId)
|
||||
{
|
||||
return relevTableMapper.selectRelevTableById(relevId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询关联实体维护
|
||||
*
|
||||
* @param relevEntity 关联实体维护ID
|
||||
* @return 关联实体维护
|
||||
*/
|
||||
@Override
|
||||
public RelevTable selectRelevTableByRelevEntity(String relevEntity)
|
||||
{
|
||||
return relevTableMapper.selectRelevTableByRelevEntity(relevEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询关联实体维护列表
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 关联实体维护
|
||||
*/
|
||||
@Override
|
||||
public List<RelevTable> selectRelevTableList(RelevTable relevTable)
|
||||
{
|
||||
return relevTableMapper.selectRelevTableList(relevTable);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增关联实体维护
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertRelevTable(RelevTable relevTable)
|
||||
{
|
||||
relevTable.setCreateTime(DateUtils.getNowDate());
|
||||
return relevTableMapper.insertRelevTable(relevTable);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改关联实体维护
|
||||
*
|
||||
* @param relevTable 关联实体维护
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateRelevTable(RelevTable relevTable)
|
||||
{
|
||||
relevTable.setUpdateTime(DateUtils.getNowDate());
|
||||
return relevTableMapper.updateRelevTable(relevTable);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除关联实体维护对象
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteRelevTableByIds(String ids)
|
||||
{
|
||||
return relevTableMapper.deleteRelevTableByIds(Convert.toStrArray(ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除关联实体维护信息
|
||||
*
|
||||
* @param relevId 关联实体维护ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteRelevTableById(Long relevId)
|
||||
{
|
||||
return relevTableMapper.deleteRelevTableById(relevId);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.system.mapper.SysBillNoMapper;
|
||||
import com.ruoyi.system.domain.SysBillNo;
|
||||
import com.ruoyi.system.service.ISysBillNoService;
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/**
|
||||
* 单据号迭代信息Service业务层处理
|
||||
*
|
||||
* @author dalin
|
||||
* @date 2020-12-15
|
||||
*/
|
||||
@Service
|
||||
public class SysBillNoServiceImpl implements ISysBillNoService
|
||||
{
|
||||
@Autowired
|
||||
private SysBillNoMapper sysBillNoMapper;
|
||||
|
||||
/**
|
||||
* 查询单据号迭代信息
|
||||
*
|
||||
* @param fperiod 单据号迭代信息ID
|
||||
* @return 单据号迭代信息
|
||||
*/
|
||||
@Override
|
||||
public SysBillNo selectSysBillNoById(String fperiod)
|
||||
{
|
||||
return sysBillNoMapper.selectSysBillNoById(fperiod);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单据号迭代信息列表
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 单据号迭代信息
|
||||
*/
|
||||
@Override
|
||||
public List<SysBillNo> selectSysBillNoList(SysBillNo sysBillNo)
|
||||
{
|
||||
return sysBillNoMapper.selectSysBillNoList(sysBillNo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增单据号迭代信息
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertSysBillNo(SysBillNo sysBillNo)
|
||||
{
|
||||
return sysBillNoMapper.insertSysBillNo(sysBillNo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改单据号迭代信息
|
||||
*
|
||||
* @param sysBillNo 单据号迭代信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateSysBillNo(SysBillNo sysBillNo)
|
||||
{
|
||||
return sysBillNoMapper.updateSysBillNo(sysBillNo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除单据号迭代信息对象
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteSysBillNoByIds(String ids)
|
||||
{
|
||||
return sysBillNoMapper.deleteSysBillNoByIds(Convert.toStrArray(ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除单据号迭代信息信息
|
||||
*
|
||||
* @param fperiod 单据号迭代信息ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteSysBillNoById(String fperiod)
|
||||
{
|
||||
return sysBillNoMapper.deleteSysBillNoById(fperiod);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public SysBillNo selectSysBillNoByBillPrefix(String billPrefix) {
|
||||
return sysBillNoMapper.selectSysBillNoByBillPrefix(billPrefix);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public String selectNextBillNoById(String billName) {
|
||||
|
||||
SysBillNo sysBillNo = sysBillNoMapper.selectSysBillNoById(billName);
|
||||
String value = sysBillNo.getNextValue();
|
||||
// 获取到值后累加
|
||||
long nextValue = Long.valueOf(sysBillNo.getIterationValue())+1;
|
||||
sysBillNo.setIterationValue(String.valueOf(nextValue));
|
||||
sysBillNo.setNextValue(sysBillNo.getIterationValue());
|
||||
sysBillNoMapper.updateSysBillNo(sysBillNo);
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
package com.ruoyi.system.util;
|
||||
|
||||
import com.ruoyi.common.exception.BusinessException;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.common.utils.spring.SpringUtils;
|
||||
import com.ruoyi.system.service.ISysBillNoService;
|
||||
import com.ruoyi.system.service.impl.SysBillNoServiceImpl;
|
||||
|
||||
/**
|
||||
* 单据号管理工具类
|
||||
* @author pandong
|
||||
*
|
||||
*/
|
||||
public class BillNoUtils {
|
||||
|
||||
|
||||
private static ISysBillNoService billNoService = SpringUtils.getBean(SysBillNoServiceImpl.class);
|
||||
|
||||
/***
|
||||
* 获取单据标识下一个单据号
|
||||
* @param billNoType
|
||||
* @return
|
||||
*/
|
||||
public static String nextValue( String billNoType ){
|
||||
|
||||
if ( StringUtils.isNull(billNoType) ){
|
||||
throw new BusinessException("缺少必须参数：单据标识");
|
||||
}
|
||||
String value = "";
|
||||
synchronized (BillNoUtils.class) {
|
||||
value = billNoService.selectNextBillNoById( billNoType );
|
||||
}
|
||||
if ( StringUtils.isEmpty(value) ){
|
||||
throw new BusinessException(String.format("未查询到%s相关单据信息,请确认！", billNoType ));
|
||||
}
|
||||
return value;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,113 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.system.mapper.RelevTableMapper">
|
||||
|
||||
<resultMap type="RelevTable" id="RelevTableResult">
|
||||
<result property="relevId" column="relev_id" />
|
||||
<result property="relevName" column="relev_name" />
|
||||
<result property="relevEntity" column="relev_entity" />
|
||||
<result property="relevEntityId" column="relev_entity_id" />
|
||||
<result property="relevEntityName" column="relev_entity_name" />
|
||||
<result property="isDefaultValue" column="is_default_value" />
|
||||
<result property="relevTable" column="relev_table" />
|
||||
<result property="relevTableId" column="relev_table_id" />
|
||||
<result property="relevTableName" column="relev_table_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectRelevTableVo">
|
||||
select relev_id, relev_name, relev_entity, relev_entity_id, relev_entity_name, is_default_value, relev_table, relev_table_id, relev_table_name, create_by, create_time, update_by, update_time from sys_relev_table
|
||||
</sql>
|
||||
|
||||
<select id="selectRelevTableList" parameterType="RelevTable" resultMap="RelevTableResult">
|
||||
<include refid="selectRelevTableVo"/>
|
||||
<where>
|
||||
<if test="relevName != null and relevName != ''"> and relev_name like concat('%', #{relevName}, '%')</if>
|
||||
<if test="relevEntity != null and relevEntity != ''"> and relev_entity = #{relevEntity}</if>
|
||||
<if test="relevEntityId != null and relevEntityId != ''"> and relev_entity_id = #{relevEntityId}</if>
|
||||
<if test="relevEntityName != null and relevEntityName != ''"> and relev_entity_name like concat('%', #{relevEntityName}, '%')</if>
|
||||
<if test="isDefaultValue != null and isDefaultValue != ''"> and is_default_value = #{isDefaultValue}</if>
|
||||
<if test="relevTable != null and relevTable != ''"> and relev_table = #{relevTable}</if>
|
||||
<if test="relevTableId != null and relevTableId != ''"> and relev_table_id = #{relevTableId}</if>
|
||||
<if test="relevTableName != null and relevTableName != ''"> and relev_table_name like concat('%', #{relevTableName}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectRelevTableById" parameterType="Long" resultMap="RelevTableResult">
|
||||
<include refid="selectRelevTableVo"/>
|
||||
where relev_id = #{relevId}
|
||||
</select>
|
||||
|
||||
<select id="selectRelevTableByRelevEntity" parameterType="String" resultMap="RelevTableResult">
|
||||
<include refid="selectRelevTableVo"/>
|
||||
where relev_entity = #{relevEntity}
|
||||
</select>
|
||||
|
||||
<insert id="insertRelevTable" parameterType="RelevTable" useGeneratedKeys="true" keyProperty="relevId">
|
||||
insert into sys_relev_table
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="relevName != null">relev_name,</if>
|
||||
<if test="relevEntity != null">relev_entity,</if>
|
||||
<if test="relevEntityId != null">relev_entity_id,</if>
|
||||
<if test="relevEntityName != null">relev_entity_name,</if>
|
||||
<if test="isDefaultValue != null and isDefaultValue != ''">is_default_value,</if>
|
||||
<if test="relevTable != null">relev_table,</if>
|
||||
<if test="relevTableId != null">relev_table_id,</if>
|
||||
<if test="relevTableName != null">relev_table_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="relevName != null">#{relevName},</if>
|
||||
<if test="relevEntity != null">#{relevEntity},</if>
|
||||
<if test="relevEntityId != null">#{relevEntityId},</if>
|
||||
<if test="relevEntityName != null">#{relevEntityName},</if>
|
||||
<if test="isDefaultValue != null and isDefaultValue != ''">#{isDefaultValue},</if>
|
||||
<if test="relevTable != null">#{relevTable},</if>
|
||||
<if test="relevTableId != null">#{relevTableId},</if>
|
||||
<if test="relevTableName != null">#{relevTableName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateRelevTable" parameterType="RelevTable">
|
||||
update sys_relev_table
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="relevName != null">relev_name = #{relevName},</if>
|
||||
<if test="relevEntity != null">relev_entity = #{relevEntity},</if>
|
||||
<if test="relevEntityId != null">relev_entity_id = #{relevEntityId},</if>
|
||||
<if test="relevEntityName != null">relev_entity_name = #{relevEntityName},</if>
|
||||
<if test="isDefaultValue != null and isDefaultValue != ''">is_default_value = #{isDefaultValue},</if>
|
||||
<if test="relevTable != null">relev_table = #{relevTable},</if>
|
||||
<if test="relevTableId != null">relev_table_id = #{relevTableId},</if>
|
||||
<if test="relevTableName != null">relev_table_name = #{relevTableName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where relev_id = #{relevId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteRelevTableById" parameterType="Long">
|
||||
delete from sys_relev_table where relev_id = #{relevId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteRelevTableByIds" parameterType="String">
|
||||
delete from sys_relev_table where relev_id in
|
||||
<foreach item="relevId" collection="array" open="(" separator="," close=")">
|
||||
#{relevId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.system.mapper.SysBillNoMapper">
|
||||
|
||||
<resultMap type="SysBillNo" id="SysBillNoResult">
|
||||
<result property="fperiod" column="fperiod" />
|
||||
<result property="billName" column="bill_name" />
|
||||
<result property="iterationValue" column="iteration_value" />
|
||||
<result property="nextValue" column="next_value" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSysBillNoVo">
|
||||
select fperiod, bill_name, iteration_value, next_value, remark from sys_bill_no
|
||||
</sql>
|
||||
|
||||
<select id="selectSysBillNoList" parameterType="SysBillNo" resultMap="SysBillNoResult">
|
||||
<include refid="selectSysBillNoVo"/>
|
||||
<where>
|
||||
<if test="iterationValue != null and iterationValue != ''"> and iteration_value = #{iterationValue}</if>
|
||||
<if test="nextValue != null and nextValue != ''"> and next_value = #{nextValue}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectSysBillNoByBillPrefix" parameterType="String" resultMap="SysBillNoResult">
|
||||
<include refid="selectSysBillNoVo"/>
|
||||
where bill_prefix = #{billPrefix}
|
||||
</select>
|
||||
|
||||
<select id="selectSysBillNoById" parameterType="String" resultMap="SysBillNoResult">
|
||||
<include refid="selectSysBillNoVo"/>
|
||||
where fperiod = #{fperiod}
|
||||
</select>
|
||||
|
||||
<insert id="insertSysBillNo" parameterType="SysBillNo">
|
||||
insert into sys_bill_no
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="fperiod != null">fperiod,</if>
|
||||
<if test="billName != null">bill_name,</if>
|
||||
<if test="iterationValue != null and iterationValue != ''">iteration_value,</if>
|
||||
<if test="nextValue != null and nextValue != ''">next_value,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="fperiod != null">#{fperiod},</if>
|
||||
<if test="billName != null">#{billName},</if>
|
||||
<if test="iterationValue != null and iterationValue != ''">#{iterationValue},</if>
|
||||
<if test="nextValue != null and nextValue != ''">#{nextValue},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateSysBillNo" parameterType="SysBillNo">
|
||||
update sys_bill_no
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="billName != null">bill_name = #{billName},</if>
|
||||
<if test="iterationValue != null and iterationValue != ''">iteration_value = #{iterationValue},</if>
|
||||
<if test="nextValue != null and nextValue != ''">next_value = #{nextValue},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
</trim>
|
||||
where fperiod = #{fperiod}
|
||||
</update>
|
||||
|
||||
<delete id="deleteSysBillNoById" parameterType="String">
|
||||
delete from sys_bill_no where fperiod = #{fperiod}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteSysBillNoByIds" parameterType="String">
|
||||
delete from sys_bill_no where fperiod in
|
||||
<foreach item="fperiod" collection="array" open="(" separator="," close=")">
|
||||
#{fperiod}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue