From 87579cb3c97a07f4a9c48a92cc3471b64f1cfd0a Mon Sep 17 00:00:00 2001 From: lin <290541200@qq.com> Date: Sat, 19 Dec 2020 19:38:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/province.sql | 159 ++++++++++++----- province-platform/pom.xml | 7 + .../province/platform/domain/EconType.java | 34 +++- .../province/platform/domain/SysBillNo.java | 101 +++++++++++ .../platform/mapper/EconTypeMapper.java | 7 +- .../platform/mapper/SysBillNoMapper.java | 75 ++++++++ .../platform/service/IEconTypeService.java | 6 +- .../platform/service/ISysBillNoService.java | 66 +++++++ .../service/impl/EconTypeServiceImpl.java | 9 +- .../service/impl/SysBillNoServiceImpl.java | 105 +++++++++++ .../province/platform/utils/BussUtils.java | 82 +++++++++ .../mapper/platform/EconTypeMapper.xml | 16 +- .../platform/EconTypeController.java | 9 +- .../platform/SysBillNoController.java | 127 ++++++++++++++ .../main/resources/static/ruoyi/css/ry-ui.css | 10 +- .../src/main/resources/templates/index.html | 2 +- .../templates/platform/econtype/add.html | 164 ++++++++---------- .../templates/platform/econtype/econtype.html | 12 +- .../templates/platform/econtype/edit.html | 64 ++++--- .../com/ruoyi/common/utils/DateUtils.java | 13 +- .../service/impl/GenTableServiceImpl.java | 1 - .../ruoyi/generator/util/VelocityUtils.java | 18 +- .../main/resources/vm/html/col2/add.html.vm | 21 +-- .../main/resources/vm/html/col2/edit.html.vm | 15 +- .../resources/vm/html/col2/formedittpl.vm | 38 +++- .../main/resources/vm/java/controller.java.vm | 11 +- .../ruoyi/system/mapper/SysMenuMapper.java | 7 +- .../ruoyi/system/service/ISysMenuService.java | 14 +- .../service/impl/SysMenuServiceImpl.java | 14 ++ .../resources/mapper/system/SysMenuMapper.xml | 10 ++ 30 files changed, 996 insertions(+), 221 deletions(-) create mode 100644 province-platform/src/main/java/com/ruoyi/province/platform/domain/SysBillNo.java create mode 100644 province-platform/src/main/java/com/ruoyi/province/platform/mapper/SysBillNoMapper.java create mode 100644 province-platform/src/main/java/com/ruoyi/province/platform/service/ISysBillNoService.java create mode 100644 province-platform/src/main/java/com/ruoyi/province/platform/service/impl/SysBillNoServiceImpl.java create mode 100644 province-platform/src/main/java/com/ruoyi/province/platform/utils/BussUtils.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/SysBillNoController.java diff --git a/doc/province.sql b/doc/province.sql index 70bfde8ac..99061fafd 100644 --- a/doc/province.sql +++ b/doc/province.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50719 File Encoding : 65001 -Date: 2020-12-17 17:41:28 +Date: 2020-12-19 19:18:41 */ SET FOREIGN_KEY_CHECKS=0; @@ -43,13 +43,14 @@ 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=41 DEFAULT CHARSET=utf8 COMMENT='代码生成业务表'; +) ENGINE=InnoDB AUTO_INCREMENT=43 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-17 10:53:38', '', '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-19 14:31:48', '', '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'); +INSERT INTO `gen_table` VALUES ('42', 'sys_bill_no', '单据号迭代信息表', null, null, 'SysBillNo', 'crud', 'com.ruoyi.province.platform', 'platform', 'sysbillno', '单据号迭代信息', 'dalin', '0', '/', '{\"parentMenuId\":\"2001\",\"treeName\":\"\",\"treeParentCode\":\"\",\"parentMenuName\":\"基础设置\",\"treeCode\":\"\"}', 'admin', '2020-12-19 15:06:41', '', '2020-12-19 15:07:34', '', '2', ''); -- ---------------------------- -- Table structure for gen_table_column @@ -82,21 +83,21 @@ CREATE TABLE `gen_table_column` ( `is_repeat_control` char(1) DEFAULT NULL COMMENT '控制名称重复', `relev_entity` varchar(100) DEFAULT NULL COMMENT '关联实体', PRIMARY KEY (`column_id`) -) ENGINE=InnoDB AUTO_INCREMENT=291 DEFAULT CHARSET=utf8 COMMENT='代码生成业务表字段'; +) ENGINE=InnoDB AUTO_INCREMENT=302 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-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 ('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-19 14:31:48', 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-19 14:31:48', null, '1', ''); +INSERT INTO `gen_table_column` VALUES ('94', '20', 'doc_num', '单据号', 'varchar(25)', 'String', 'docNum', '0', '0', null, '1', '1', '1', null, 'EQ', 'input', '', '3', 'admin', '2020-12-09 08:52:02', null, '2020-12-19 14:31:48', '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-19 14:31:48', 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-19 14:31:48', null, null, ''); +INSERT INTO `gen_table_column` VALUES ('97', '20', 'del_flag', '删除标志 删除标志', 'char(1)', 'String', 'delFlag', '0', '0', null, '1', null, null, null, 'EQ', '', '', '6', 'admin', '2020-12-09 08:52:40', null, '2020-12-19 14:31:48', null, null, ''); +INSERT INTO `gen_table_column` VALUES ('98', '20', 'create_by', '制单人', 'varchar(30)', 'String', 'createBy', '0', '0', null, '1', '1', '1', null, 'EQ', 'input', '', '7', 'admin', '2020-12-09 08:52:40', null, '2020-12-19 14:31:48', '1', null, 'SysUser'); +INSERT INTO `gen_table_column` VALUES ('99', '20', 'create_time', '制单时间', 'datetime', 'Date', 'createTime', '0', '0', null, '1', '1', '1', null, 'EQ', 'input', '', '8', 'admin', '2020-12-09 08:52:40', null, '2020-12-19 14:31:48', '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-19 14:31:48', '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-19 14:31:48', '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, ''); @@ -110,24 +111,12 @@ INSERT INTO `gen_table_column` VALUES ('287', '40', 'create_by', '创建者', 'v 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 --- ---------------------------- -DROP TABLE IF EXISTS `kid_score`; -CREATE TABLE `kid_score` ( - `id` tinyint(3) unsigned NOT NULL, - `birth_day` date NOT NULL, - `score` int(10) unsigned NOT NULL, - PRIMARY KEY (`id`,`birth_day`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- ---------------------------- --- Records of kid_score --- ---------------------------- -INSERT INTO `kid_score` VALUES ('1', '2019-01-15', '60'); -INSERT INTO `kid_score` VALUES ('2', '2019-01-15', '30'); -INSERT INTO `kid_score` VALUES ('2', '2019-01-16', '20'); +INSERT INTO `gen_table_column` VALUES ('296', '42', 'id', '', 'bigint(11)', 'Long', 'id', '1', '1', null, '1', null, null, null, 'EQ', 'input', '', '1', 'admin', '2020-12-19 15:06:41', null, '2020-12-19 15:07:34', null, null, ''); +INSERT INTO `gen_table_column` VALUES ('297', '42', 'fperiod', '期间', 'varchar(6)', 'String', 'fperiod', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', '2', 'admin', '2020-12-19 15:06:41', null, '2020-12-19 15:07:34', null, null, ''); +INSERT INTO `gen_table_column` VALUES ('298', '42', 'bill_name', '单据标识', 'varchar(40)', 'String', 'billName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', '3', 'admin', '2020-12-19 15:06:41', null, '2020-12-19 15:07:34', null, null, ''); +INSERT INTO `gen_table_column` VALUES ('299', '42', 'iteration_value', '迭代值', 'varchar(40)', 'String', 'iterationValue', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', '4', 'admin', '2020-12-19 15:06:41', null, '2020-12-19 15:07:34', null, null, ''); +INSERT INTO `gen_table_column` VALUES ('300', '42', 'next_value', '下一个值', 'varchar(60)', 'String', 'nextValue', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', '5', 'admin', '2020-12-19 15:06:41', null, '2020-12-19 15:07:34', null, null, ''); +INSERT INTO `gen_table_column` VALUES ('301', '42', 'remark', '备注', 'varchar(255)', 'String', 'remark', '0', '0', null, '1', '1', '1', null, 'EQ', 'input', '', '6', 'admin', '2020-12-19 15:06:41', null, '2020-12-19 15:07:34', null, null, ''); -- ---------------------------- -- Table structure for platf_econ_type @@ -139,13 +128,13 @@ CREATE TABLE `platf_econ_type` ( `doc_num` varchar(25) NOT NULL COMMENT '单据号', `status` char(1) NOT NULL COMMENT '资料状态 0有效 1无效', `remark` varchar(512) DEFAULT NULL COMMENT '备注', - `del_flag` char(1) NOT NULL COMMENT '删除标志 0代表存在 2代表删除', + `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标志 0代表存在 2代表删除', `create_by` varchar(30) NOT NULL COMMENT '制单人', `create_time` datetime NOT NULL COMMENT '制单时间', `update_by` varchar(30) DEFAULT NULL COMMENT '修改人', `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`econ_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='经济类型 '; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='经济类型 '; -- ---------------------------- -- Records of platf_econ_type @@ -322,7 +311,7 @@ CREATE TABLE `qrtz_scheduler_state` ( -- ---------------------------- -- Records of qrtz_scheduler_state -- ---------------------------- -INSERT INTO `qrtz_scheduler_state` VALUES ('RuoyiScheduler', 'linkuaisheng1608197296344', '1608197390489', '15000'); +INSERT INTO `qrtz_scheduler_state` VALUES ('RuoyiScheduler', 'linkuaisheng1608373242252', '1608373643751', '15000'); -- ---------------------------- -- Table structure for qrtz_simple_triggers @@ -399,26 +388,29 @@ CREATE TABLE `qrtz_triggers` ( -- ---------------------------- -- Records of qrtz_triggers -- ---------------------------- -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', ''); +INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME1', 'DEFAULT', 'TASK_CLASS_NAME1', 'DEFAULT', null, '1608373250000', '-1', '5', 'PAUSED', 'CRON', '1608373242000', '0', null, '2', ''); +INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME2', 'DEFAULT', 'TASK_CLASS_NAME2', 'DEFAULT', null, '1608373245000', '-1', '5', 'PAUSED', 'CRON', '1608373242000', '0', null, '2', ''); +INSERT INTO `qrtz_triggers` VALUES ('RuoyiScheduler', 'TASK_CLASS_NAME3', 'DEFAULT', 'TASK_CLASS_NAME3', 'DEFAULT', null, '1608373260000', '-1', '5', 'PAUSED', 'CRON', '1608373242000', '0', null, '2', ''); -- ---------------------------- -- Table structure for sys_bill_no -- ---------------------------- DROP TABLE IF EXISTS `sys_bill_no`; CREATE TABLE `sys_bill_no` ( + `id` bigint(11) NOT NULL AUTO_INCREMENT, `fperiod` varchar(6) NOT NULL COMMENT '期间', `bill_name` varchar(40) NOT NULL COMMENT '单据标识', `iteration_value` varchar(40) NOT NULL COMMENT '迭代值', `next_value` varchar(60) NOT NULL COMMENT '下一个值', `remark` varchar(255) DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`fperiod`,`bill_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='单据号迭代信息表'; + PRIMARY KEY (`id`), + UNIQUE KEY `ix_fperiod_billName` (`fperiod`,`bill_name`) +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COMMENT='单据号迭代信息表'; -- ---------------------------- -- Records of sys_bill_no -- ---------------------------- +INSERT INTO `sys_bill_no` VALUES ('18', '202012', 'econType', '1', '1', null); -- ---------------------------- -- Table structure for sys_config @@ -641,7 +633,7 @@ CREATE TABLE `sys_logininfor` ( `msg` varchar(255) DEFAULT '' COMMENT '提示消息', `login_time` datetime DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`info_id`) -) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=utf8 COMMENT='系统访问记录'; +) ENGINE=InnoDB AUTO_INCREMENT=228 DEFAULT CHARSET=utf8 COMMENT='系统访问记录'; -- ---------------------------- -- Records of sys_logininfor @@ -747,6 +739,33 @@ INSERT INTO `sys_logininfor` VALUES ('197', 'admin', '127.0.0.1', '内网IP', 'C 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'); +INSERT INTO `sys_logininfor` VALUES ('201', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '1', '验证码错误', '2020-12-18 08:01:07'); +INSERT INTO `sys_logininfor` VALUES ('202', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-18 08:01:15'); +INSERT INTO `sys_logininfor` VALUES ('203', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-18 17:00:44'); +INSERT INTO `sys_logininfor` VALUES ('204', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-18 17:20:52'); +INSERT INTO `sys_logininfor` VALUES ('205', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 09:11:31'); +INSERT INTO `sys_logininfor` VALUES ('206', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 09:38:32'); +INSERT INTO `sys_logininfor` VALUES ('207', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 10:22:58'); +INSERT INTO `sys_logininfor` VALUES ('208', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 10:42:29'); +INSERT INTO `sys_logininfor` VALUES ('209', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 11:03:16'); +INSERT INTO `sys_logininfor` VALUES ('210', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 11:20:21'); +INSERT INTO `sys_logininfor` VALUES ('211', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 11:58:20'); +INSERT INTO `sys_logininfor` VALUES ('212', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 12:04:03'); +INSERT INTO `sys_logininfor` VALUES ('213', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 13:49:31'); +INSERT INTO `sys_logininfor` VALUES ('214', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 13:50:32'); +INSERT INTO `sys_logininfor` VALUES ('215', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 14:08:41'); +INSERT INTO `sys_logininfor` VALUES ('216', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 14:16:30'); +INSERT INTO `sys_logininfor` VALUES ('217', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 14:16:58'); +INSERT INTO `sys_logininfor` VALUES ('218', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 14:30:37'); +INSERT INTO `sys_logininfor` VALUES ('219', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 14:59:22'); +INSERT INTO `sys_logininfor` VALUES ('220', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '1', '验证码错误', '2020-12-19 17:31:29'); +INSERT INTO `sys_logininfor` VALUES ('221', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 17:31:32'); +INSERT INTO `sys_logininfor` VALUES ('222', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 17:40:21'); +INSERT INTO `sys_logininfor` VALUES ('223', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 17:46:06'); +INSERT INTO `sys_logininfor` VALUES ('224', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '1', '验证码错误', '2020-12-19 18:18:51'); +INSERT INTO `sys_logininfor` VALUES ('225', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '1', '验证码错误', '2020-12-19 18:18:55'); +INSERT INTO `sys_logininfor` VALUES ('226', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 18:18:58'); +INSERT INTO `sys_logininfor` VALUES ('227', 'admin', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', '0', '登录成功', '2020-12-19 18:20:55'); -- ---------------------------- -- Table structure for sys_menu @@ -771,7 +790,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=2068 DEFAULT CHARSET=utf8 COMMENT='菜单权限表'; +) ENGINE=InnoDB AUTO_INCREMENT=2074 DEFAULT CHARSET=utf8 COMMENT='菜单权限表'; -- ---------------------------- -- Records of sys_menu @@ -881,6 +900,12 @@ INSERT INTO `sys_menu` VALUES ('2064', '关联实体维护新增', '2062', '2', 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, '', '', ''); +INSERT INTO `sys_menu` VALUES ('2068', '单据号迭代信息', '2001', '1', '/platform/sysbillno', '', 'C', '0', 'platform:sysbillno:view', '#', 'admin', '2020-12-19 15:59:53', '', null, '单据号迭代信息菜单', '00001', 'sysBillNo'); +INSERT INTO `sys_menu` VALUES ('2069', '单据号迭代信息查询', '2068', '1', '#', '', 'F', '0', 'platform:sysbillno:list', '#', 'admin', '2020-12-19 15:59:53', '', null, '', '', ''); +INSERT INTO `sys_menu` VALUES ('2070', '单据号迭代信息新增', '2068', '2', '#', '', 'F', '0', 'platform:sysbillno:add', '#', 'admin', '2020-12-19 15:59:53', '', null, '', '', ''); +INSERT INTO `sys_menu` VALUES ('2071', '单据号迭代信息修改', '2068', '3', '#', '', 'F', '0', 'platform:sysbillno:edit', '#', 'admin', '2020-12-19 15:59:53', '', null, '', '', ''); +INSERT INTO `sys_menu` VALUES ('2072', '单据号迭代信息删除', '2068', '4', '#', '', 'F', '0', 'platform:sysbillno:remove', '#', 'admin', '2020-12-19 15:59:53', '', null, '', '', ''); +INSERT INTO `sys_menu` VALUES ('2073', '单据号迭代信息导出', '2068', '5', '#', '', 'F', '0', 'platform:sysbillno:export', '#', 'admin', '2020-12-19 15:59:53', '', null, '', '', ''); -- ---------------------------- -- Table structure for sys_notice @@ -928,7 +953,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=346 DEFAULT CHARSET=utf8 COMMENT='操作日志记录'; +) ENGINE=InnoDB AUTO_INCREMENT=390 DEFAULT CHARSET=utf8 COMMENT='操作日志记录'; -- ---------------------------- -- Records of sys_oper_log @@ -1179,6 +1204,50 @@ INSERT INTO `sys_oper_log` VALUES ('342', '代码生成', '6', 'com.ruoyi.genera 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'); +INSERT INTO `sys_oper_log` VALUES ('346', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 08:12:14'); +INSERT INTO `sys_oper_log` VALUES ('347', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 08:21:32'); +INSERT INTO `sys_oper_log` VALUES ('348', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 08:22:25'); +INSERT INTO `sys_oper_log` VALUES ('349', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 08:36:35'); +INSERT INTO `sys_oper_log` VALUES ('350', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 08:37:49'); +INSERT INTO `sys_oper_log` VALUES ('351', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 11:29:22'); +INSERT INTO `sys_oper_log` VALUES ('352', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 13:31:27'); +INSERT INTO `sys_oper_log` VALUES ('353', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '1', 'Encountered \"hiddenleftjoinfiledcols\" at vm/xml/mapper.xml.vm[line 35, column 5]\r\nWas expecting one of:\r\n \"[\" ...\r\n \"{\" ...\r\n \"(\" ...\r\n ...\r\n ...\r\n \"true\" ...\r\n \"false\" ...\r\n ...\r\n ...\r\n ...\r\n \"{\" ...\r\n ...\r\n ', '2020-12-18 17:05:11'); +INSERT INTO `sys_oper_log` VALUES ('354', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:10:23'); +INSERT INTO `sys_oper_log` VALUES ('355', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:10:55'); +INSERT INTO `sys_oper_log` VALUES ('356', '代码生成', '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].relevEntity\":[\"\"],\"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].isRepeatControl\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevEntity\":[\"\"],\"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].relevEntity\":[\"\"],\"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].relevEntity\":[\"\"],\"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\"],\"c', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-18 17:13:04'); +INSERT INTO `sys_oper_log` VALUES ('357', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:13:22'); +INSERT INTO `sys_oper_log` VALUES ('358', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:19:48'); +INSERT INTO `sys_oper_log` VALUES ('359', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:20:19'); +INSERT INTO `sys_oper_log` VALUES ('360', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:23:15'); +INSERT INTO `sys_oper_log` VALUES ('361', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:24:59'); +INSERT INTO `sys_oper_log` VALUES ('362', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:34:26'); +INSERT INTO `sys_oper_log` VALUES ('363', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:38:14'); +INSERT INTO `sys_oper_log` VALUES ('364', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:41:47'); +INSERT INTO `sys_oper_log` VALUES ('365', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-18 17:45:29'); +INSERT INTO `sys_oper_log` VALUES ('366', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 09:00:53'); +INSERT INTO `sys_oper_log` VALUES ('367', '代码生成', '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].relevEntity\":[\"\"],\"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].isRepeatControl\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevEntity\":[\"\"],\"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].relevEntity\":[\"\"],\"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].relevEntity\":[\"\"],\"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\"],\"c', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-19 09:08:23'); +INSERT INTO `sys_oper_log` VALUES ('368', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 09:08:42'); +INSERT INTO `sys_oper_log` VALUES ('369', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 10:23:08'); +INSERT INTO `sys_oper_log` VALUES ('370', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 10:23:28'); +INSERT INTO `sys_oper_log` VALUES ('371', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 10:42:58'); +INSERT INTO `sys_oper_log` VALUES ('372', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 11:58:26'); +INSERT INTO `sys_oper_log` VALUES ('373', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 12:04:10'); +INSERT INTO `sys_oper_log` VALUES ('374', '代码生成', '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].relevEntity\":[\"\"],\"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].isRepeatControl\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevEntity\":[\"\"],\"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].relevEntity\":[\"\"],\"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].relevEntity\":[\"\"],\"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\"],\"c', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-19 14:21:24'); +INSERT INTO `sys_oper_log` VALUES ('375', '代码生成', '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].relevEntity\":[\"\"],\"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].isRepeatControl\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevEntity\":[\"\"],\"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].isReadonly\":[\"1\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[2].relevEntity\":[\"\"],\"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].relevEntity\":[\"\"],\"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\"],\"c', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-19 14:31:48'); +INSERT INTO `sys_oper_log` VALUES ('376', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/platf_econ_type', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 14:31:51'); +INSERT INTO `sys_oper_log` VALUES ('377', '代码生成', '6', 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/importTable', '127.0.0.1', '内网IP', '{\"tables\":[\"sys_bill_no\"]}', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-19 15:00:09'); +INSERT INTO `sys_oper_log` VALUES ('378', '代码生成', '3', 'com.ruoyi.generator.controller.GenController.remove()', 'POST', '1', 'admin', '研发部门', '/tool/gen/remove', '127.0.0.1', '内网IP', '{\"ids\":[\"41\"]}', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-19 15:02:20'); +INSERT INTO `sys_oper_log` VALUES ('379', '代码生成', '6', 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/importTable', '127.0.0.1', '内网IP', '{\"tables\":[\"sys_bill_no\"]}', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-19 15:06:41'); +INSERT INTO `sys_oper_log` VALUES ('380', '代码生成', '2', 'com.ruoyi.generator.controller.GenController.editSave()', 'POST', '1', 'admin', '研发部门', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"42\"],\"tableName\":[\"sys_bill_no\"],\"tableComment\":[\"单据号迭代信息表\"],\"className\":[\"SysBillNo\"],\"functionAuthor\":[\"dalin\"],\"remark\":[\"\"],\"formCols\":[\"2\"],\"billPrefix\":[\"\"],\"columns[0].columnId\":[\"296\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"\"],\"columns[0].javaType\":[\"Long\"],\"columns[0].javaField\":[\"id\"],\"columns[0].isInsert\":[\"1\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[0].relevEntity\":[\"\"],\"columns[1].columnId\":[\"297\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"期间\"],\"columns[1].javaType\":[\"String\"],\"columns[1].javaField\":[\"fperiod\"],\"columns[1].isInsert\":[\"1\"],\"columns[1].isEdit\":[\"1\"],\"columns[1].isList\":[\"1\"],\"columns[1].isQuery\":[\"1\"],\"columns[1].queryType\":[\"EQ\"],\"columns[1].isRequired\":[\"1\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[1].relevEntity\":[\"\"],\"columns[2].columnId\":[\"298\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"单据标识\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"billName\"],\"columns[2].isInsert\":[\"1\"],\"columns[2].isEdit\":[\"1\"],\"columns[2].isList\":[\"1\"],\"columns[2].isQuery\":[\"1\"],\"columns[2].queryType\":[\"LIKE\"],\"columns[2].isRequired\":[\"1\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[2].relevEntity\":[\"\"],\"columns[3].columnId\":[\"299\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"迭代值\"],\"columns[3].javaType\":[\"String\"],\"columns[3].javaField\":[\"iterationValue\"],\"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\":[\"input\"],\"columns[3].dictType\":[\"\"],\"columns[3].relevEntity\":[\"\"],\"columns[4].columnId\":[\"300\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"下一个值\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"nextValue\"],\"columns[4].isInsert\":[\"1\"],\"columns[4].isEdit\":[\"1\"],\"columns[4].isList\":[\"1\"],\"columns[4].isQuery\":[\"1\"],\"columns[4].qu', '{\r\n \"msg\" : \"操作成功\",\r\n \"code\" : 0\r\n}', '0', null, '2020-12-19 15:07:34'); +INSERT INTO `sys_oper_log` VALUES ('381', '代码生成', '8', 'com.ruoyi.generator.controller.GenController.download()', 'GET', '1', 'admin', '研发部门', '/tool/gen/download/sys_bill_no', '127.0.0.1', '内网IP', null, 'null', '0', null, '2020-12-19 15:07:42'); +INSERT INTO `sys_oper_log` VALUES ('382', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"222\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"221\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 17:31:42\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', 'Invalid bound statement (not found): com.ruoyi.province.platform.mapper.SysBillNoMapper.selectSysBillNoByPeriod', '2020-12-19 17:33:06'); +INSERT INTO `sys_oper_log` VALUES ('383', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"水电费\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"水电费\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 17:40:25\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', '\r\n### Error querying database. Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\r\n### The error may exist in file [E:\\IdeaSpaceWork\\RuoYi\\province-platform\\target\\classes\\mapper\\platform\\SysBillNoMapper.xml]\r\n### The error may involve com.ruoyi.province.platform.mapper.SysBillNoMapper.selectSysBillNoByPeriod-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into sys_bill_no(`fperiod`,`bill_name`,`iteration_value`,`next_value`) values (?,?,?,?) ON DUPLICATE KEY UPDATE iteration_value = iteration_value + 1; select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark from sys_bill_no t where t.fperiod = ? And t.bill_name = ?;\r\n### Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3', '2020-12-19 17:40:40'); +INSERT INTO `sys_oper_log` VALUES ('384', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"水电费\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"水电费\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 17:40:25\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', '\r\n### Error querying database. Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\r\n### The error may exist in file [E:\\IdeaSpaceWork\\RuoYi\\province-platform\\target\\classes\\mapper\\platform\\SysBillNoMapper.xml]\r\n### The error may involve com.ruoyi.province.platform.mapper.SysBillNoMapper.selectSysBillNoByPeriod-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into sys_bill_no(`fperiod`,`bill_name`,`iteration_value`,`next_value`) values (?,?,?,?) ON DUPLICATE KEY UPDATE iteration_value = iteration_value + 1; select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark from sys_bill_no t where t.fperiod = ? And t.bill_name = ?;\r\n### Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3', '2020-12-19 17:43:23'); +INSERT INTO `sys_oper_log` VALUES ('385', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"22121\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"1221\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 17:46:12\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', '\r\n### Error querying database. Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\r\n### The error may exist in file [E:\\IdeaSpaceWork\\RuoYi\\province-platform\\target\\classes\\mapper\\platform\\SysBillNoMapper.xml]\r\n### The error may involve com.ruoyi.province.platform.mapper.SysBillNoMapper.selectSysBillNoByPeriod-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into sys_bill_no(`fperiod`,`bill_name`,`iteration_value`,`next_value`) values (?,?,?,?) ON DUPLICATE KEY UPDATE iteration_value = iteration_value + 1; select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark from sys_bill_no t where t.fperiod = ? And t.bill_name = ?;\r\n### Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3', '2020-12-19 17:46:23'); +INSERT INTO `sys_oper_log` VALUES ('386', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"胜多负少\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"水电费\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 17:49:13\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', '\r\n### Error querying database. Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\r\n### The error may exist in file [E:\\IdeaSpaceWork\\RuoYi\\province-platform\\target\\classes\\mapper\\platform\\SysBillNoMapper.xml]\r\n### The error may involve com.ruoyi.province.platform.mapper.SysBillNoMapper.selectSysBillNoByPeriod-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into sys_bill_no(`fperiod`,`bill_name`,`iteration_value`,`next_value`) values (?,?,?,?) ON DUPLICATE KEY UPDATE iteration_value = iteration_value + 1; select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark from sys_bill_no t where t.fperiod = ? And t.bill_name = ?;\r\n### Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'select t.id, t.fperiod, t.bill_name, t.iteration_value, t.next_value, t.remark \' at line 3', '2020-12-19 17:49:36'); +INSERT INTO `sys_oper_log` VALUES ('387', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"sdf\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"sdfdf\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 18:19:04\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', 'nested exception is org.apache.ibatis.executor.ExecutorException: Error getting generated key or setting result to parameter object. Cause: org.apache.ibatis.executor.ExecutorException: No setter found for the keyProperty \'idd\' in \'com.ruoyi.province.platform.domain.SysBillNo\'.', '2020-12-19 18:19:21'); +INSERT INTO `sys_oper_log` VALUES ('388', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"wer\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"wer\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 18:21:00\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', '\r\n### Error updating database. Cause: java.sql.SQLException: Field \'del_flag\' doesn\'t have a default value\r\n### The error may exist in file [E:\\IdeaSpaceWork\\RuoYi\\province-platform\\target\\classes\\mapper\\platform\\EconTypeMapper.xml]\r\n### The error may involve com.ruoyi.province.platform.mapper.EconTypeMapper.insertEconType-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into platf_econ_type ( econ_name, doc_num, status, remark, create_by, create_time, update_by ) values ( ?, ?, ?, ?, ?, ?, ? )\r\n### Cause: java.sql.SQLException: Field \'del_flag\' doesn\'t have a default value\n; Field \'del_flag\' doesn\'t have a default value; nested exception is java.sql.SQLException: Field \'del_flag\' doesn\'t have a default value', '2020-12-19 18:21:25'); +INSERT INTO `sys_oper_log` VALUES ('389', '经济类型', '1', 'com.ruoyi.web.controller.platform.EconTypeController.addSave()', 'POST', '1', 'admin', '研发部门', '/platform/econtype/add', '127.0.0.1', '内网IP', '{\"createBy\":[\"admin\"],\"updateBy\":[\"\"],\"econName\":[\"wer\"],\"docNum\":[\"\"],\"status\":[\"0\"],\"remark\":[\"werdsfd\"],\"createByuserName\":[\"平台管理员\"],\"createTime\":[\"2020-12-19 18:21:00\"],\"updateByuserName\":[\"\"],\"updateTime\":[\"\"]}', 'null', '1', '\r\n### Error updating database. Cause: java.sql.SQLException: Field \'del_flag\' doesn\'t have a default value\r\n### The error may exist in file [E:\\IdeaSpaceWork\\RuoYi\\province-platform\\target\\classes\\mapper\\platform\\EconTypeMapper.xml]\r\n### The error may involve com.ruoyi.province.platform.mapper.EconTypeMapper.insertEconType-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into platf_econ_type ( econ_name, doc_num, status, remark, create_by, create_time, update_by ) values ( ?, ?, ?, ?, ?, ?, ? )\r\n### Cause: java.sql.SQLException: Field \'del_flag\' doesn\'t have a default value\n; Field \'del_flag\' doesn\'t have a default value; nested exception is java.sql.SQLException: Field \'del_flag\' doesn\'t have a default value', '2020-12-19 18:22:53'); -- ---------------------------- -- Table structure for sys_post @@ -1406,7 +1475,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-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 ('1', '103', 'admin', '平台管理员', '00', '290541200@qq.com', '18258987010', '1', '', '29c67a30398638269fe600f73a054934', '111111', '0', '0', '127.0.0.1', '2020-12-19 18:20:56', '2020-12-08 07:51:59', 'admin', '2020-12-08 07:51:59', '', '2020-12-19 18:20:55', '管理员'); 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, '测试员'); -- ---------------------------- @@ -1431,7 +1500,7 @@ CREATE TABLE `sys_user_online` ( -- ---------------------------- -- Records of sys_user_online -- ---------------------------- -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'); +INSERT INTO `sys_user_online` VALUES ('5e58bad9-97f4-49a5-b893-562d9c234f2b', 'admin', '研发部门', '127.0.0.1', '内网IP', 'Chrome', 'Windows 7', 'on_line', '2020-12-19 18:18:47', '2020-12-19 18:22:47', '1800000'); -- ---------------------------- -- Table structure for sys_user_post diff --git a/province-platform/pom.xml b/province-platform/pom.xml index 84594909b..f03742750 100644 --- a/province-platform/pom.xml +++ b/province-platform/pom.xml @@ -24,6 +24,13 @@ ruoyi-common + + + com.ruoyi + ruoyi-system + + + diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java b/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java index 336e2af88..869b45fde 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java @@ -1,15 +1,15 @@ package com.ruoyi.province.platform.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; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 经济类型对象 platf_econ_type * * @author dalin - * @date 2020-12-09 + * @date 2020-12-19 */ public class EconType extends BaseEntity { @@ -33,6 +33,14 @@ public class EconType extends BaseEntity /** 删除标志 删除标志 */ private String delFlag; + /** 制单人 */ + @Excel(name = "制单人") + private String createByuserName; + + /** 修改人 */ + @Excel(name = "修改人") + private String updateByuserName; + public void setEconId(Long econId) { this.econId = econId; @@ -78,6 +86,24 @@ public class EconType extends BaseEntity { return delFlag; } + public void setCreateByuserName(String createByuserName) + { + this.createByuserName = createByuserName; + } + + public String getCreateByuserName() + { + return createByuserName; + } + public void setUpdateByuserName(String updateByuserName) + { + this.updateByuserName = updateByuserName; + } + + public String getUpdateByuserName() + { + return updateByuserName; + } @Override public String toString() { @@ -88,8 +114,10 @@ public class EconType extends BaseEntity .append("status", getStatus()) .append("remark", getRemark()) .append("delFlag", getDelFlag()) + .append("createByuserName", getCreateByuserName()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) + .append("updateByuserName", getUpdateByuserName()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .toString(); diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/domain/SysBillNo.java b/province-platform/src/main/java/com/ruoyi/province/platform/domain/SysBillNo.java new file mode 100644 index 000000000..df6f73587 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/domain/SysBillNo.java @@ -0,0 +1,101 @@ +package com.ruoyi.province.platform.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-19 + */ +public class SysBillNo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 期间 */ + @Excel(name = "期间") + private String fperiod; + + /** 单据标识 */ + @Excel(name = "单据标识") + private String billName; + + /** 迭代值 */ + @Excel(name = "迭代值") + private String iterationValue; + + /** 下一个值 */ + @Excel(name = "下一个值") + private String nextValue; + +// SysBillNo(String fperiod,String billName,String iterationValue,String nextValue){ +// this.fperiod = fperiod ; +// this.billName = billName ; +// this.iterationValue = iterationValue; +// this.nextValue = nextValue ; +// } + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + 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("id", getId()) + .append("fperiod", getFperiod()) + .append("billName", getBillName()) + .append("iterationValue", getIterationValue()) + .append("nextValue", getNextValue()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java index 80d043e37..7e8ab9927 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java @@ -1,13 +1,14 @@ package com.ruoyi.province.platform.mapper; -import java.util.List; import com.ruoyi.province.platform.domain.EconType; +import java.util.List; + /** * 经济类型Mapper接口 * * @author dalin - * @date 2020-12-09 + * @date 2020-12-19 */ public interface EconTypeMapper { @@ -19,7 +20,7 @@ public interface EconTypeMapper */ public EconType selectEconTypeById(Long econId); - /** + /** * 查询经济类型列表 * * @param econType 经济类型 diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/mapper/SysBillNoMapper.java b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/SysBillNoMapper.java new file mode 100644 index 000000000..89f5260b9 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/SysBillNoMapper.java @@ -0,0 +1,75 @@ +package com.ruoyi.province.platform.mapper; + +import com.ruoyi.province.platform.domain.SysBillNo; + +import java.util.List; + +/** + * 单据号迭代信息Mapper接口 + * + * @author dalin + * @date 2020-12-19 + */ +public interface SysBillNoMapper +{ + /** + * 查询单据号迭代信息 + * + * @param id 单据号迭代信息ID + * @return 单据号迭代信息 + */ + public SysBillNo selectSysBillNoById(Long id); + + /** + * 查询单据号迭代信息 + * + * @param EntityId 单据号迭代信息ID + * @return 单据号迭代信息 + */ + public SysBillNo selectMenusByEntityId(Long id); + + + public SysBillNo selectSysBillNoByPeriod(SysBillNo sysBillNo); + + /** + * 查询单据号迭代信息列表 + * + * @param sysBillNo 单据号迭代信息 + * @return 单据号迭代信息集合 + */ + public List selectSysBillNoList(SysBillNo sysBillNo); + + public int insertDuplicateByPeriod(SysBillNo sysBillNo); + + /** + * 新增单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + public int insertSysBillNo(SysBillNo sysBillNo); + + /** + * 修改单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + public int updateSysBillNo(SysBillNo sysBillNo); + + /** + * 删除单据号迭代信息 + * + * @param id 单据号迭代信息ID + * @return 结果 + */ + public int deleteSysBillNoById(Long id); + + /** + * 批量删除单据号迭代信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysBillNoByIds(String[] ids); +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java index 8861d72c2..8ceb7db44 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java @@ -1,13 +1,14 @@ package com.ruoyi.province.platform.service; -import java.util.List; import com.ruoyi.province.platform.domain.EconType; +import java.util.List; + /** * 经济类型Service接口 * * @author dalin - * @date 2020-12-09 + * @date 2020-12-19 */ public interface IEconTypeService { @@ -19,6 +20,7 @@ public interface IEconTypeService */ public EconType selectEconTypeById(Long econId); + /** * 查询经济类型列表 * diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/ISysBillNoService.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/ISysBillNoService.java new file mode 100644 index 000000000..6418334ca --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/ISysBillNoService.java @@ -0,0 +1,66 @@ +package com.ruoyi.province.platform.service; + +import com.ruoyi.province.platform.domain.SysBillNo; + +import java.util.List; + +/** + * 单据号迭代信息Service接口 + * + * @author dalin + * @date 2020-12-19 + */ +public interface ISysBillNoService +{ + /** + * 查询单据号迭代信息 + * + * @param id 单据号迭代信息ID + * @return 单据号迭代信息 + */ + public SysBillNo selectSysBillNoById(Long id); + + public SysBillNo selectSysBillNoByPeriod(SysBillNo sysBillNo); + + /** + * 查询单据号迭代信息列表 + * + * @param sysBillNo 单据号迭代信息 + * @return 单据号迭代信息集合 + */ + public List selectSysBillNoList(SysBillNo sysBillNo); + + public int insertDuplicateByPeriod(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 id 单据号迭代信息ID + * @return 结果 + */ + public int deleteSysBillNoById(Long id); +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java index 524cb9b29..17386b1d5 100644 --- a/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.province.platform.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.province.platform.utils.BussUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.province.platform.mapper.EconTypeMapper; @@ -13,7 +14,7 @@ import com.ruoyi.common.core.text.Convert; * 经济类型Service业务层处理 * * @author dalin - * @date 2020-12-09 + * @date 2020-12-19 */ @Service public class EconTypeServiceImpl implements IEconTypeService @@ -33,7 +34,7 @@ public class EconTypeServiceImpl implements IEconTypeService return econTypeMapper.selectEconTypeById(econId); } - /** + /** * 查询经济类型列表 * * @param econType 经济类型 @@ -54,6 +55,10 @@ public class EconTypeServiceImpl implements IEconTypeService @Override public int insertEconType(EconType econType) { + // 判断重复 + + // 单据号生成 + econType.setDocNum("00001".concat( BussUtils.nextValue("econType") ) ); econType.setCreateTime(DateUtils.getNowDate()); return econTypeMapper.insertEconType(econType); } diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/SysBillNoServiceImpl.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/SysBillNoServiceImpl.java new file mode 100644 index 000000000..cada2dd1d --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/SysBillNoServiceImpl.java @@ -0,0 +1,105 @@ +package com.ruoyi.province.platform.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.province.platform.mapper.SysBillNoMapper; +import com.ruoyi.province.platform.domain.SysBillNo; +import com.ruoyi.province.platform.service.ISysBillNoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 单据号迭代信息Service业务层处理 + * + * @author dalin + * @date 2020-12-19 + */ +@Service +public class SysBillNoServiceImpl implements ISysBillNoService +{ + @Autowired + private SysBillNoMapper sysBillNoMapper; + + /** + * 查询单据号迭代信息 + * + * @param id 单据号迭代信息ID + * @return 单据号迭代信息 + */ + @Override + public SysBillNo selectSysBillNoById(Long id) + { + return sysBillNoMapper.selectSysBillNoById(id); + } + + /** + * 查询单据号迭代信息列表 + * + * @param sysBillNo 单据号迭代信息 + * @return 单据号迭代信息 + */ + @Override + public List selectSysBillNoList(SysBillNo sysBillNo) + { + return sysBillNoMapper.selectSysBillNoList(sysBillNo); + } + + @Override + public SysBillNo selectSysBillNoByPeriod(SysBillNo sysBillNo) + { + return sysBillNoMapper.selectSysBillNoByPeriod(sysBillNo); + } + + @Override + public int insertDuplicateByPeriod(SysBillNo sysBillNo) + { + return sysBillNoMapper.insertDuplicateByPeriod(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 id 单据号迭代信息ID + * @return 结果 + */ + @Override + public int deleteSysBillNoById(Long id) + { + return sysBillNoMapper.deleteSysBillNoById(id); + } +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/utils/BussUtils.java b/province-platform/src/main/java/com/ruoyi/province/platform/utils/BussUtils.java new file mode 100644 index 000000000..b483f7ea1 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/utils/BussUtils.java @@ -0,0 +1,82 @@ +package com.ruoyi.province.platform.utils; + +import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.common.exception.BusinessException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.province.platform.domain.SysBillNo; +import com.ruoyi.province.platform.mapper.SysBillNoMapper; +import com.ruoyi.system.mapper.SysMenuMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * 单据号管理工具类 + * @author pandong + * + */ +@Component +public class BussUtils { + + @Autowired + private SysMenuMapper menuMapper; + + @Autowired + private SysBillNoMapper sysBillNoMapper; + + private static BussUtils bussUtils ; + + + @PostConstruct //通过@PostConstruct实现初始化bean之前进行的操作 + public void init() { + bussUtils = this; + bussUtils.sysBillNoMapper = this.sysBillNoMapper; + } + /*** + * 获取单据标识下一个单据号 + * @param billNoType + * @return + */ + public static String nextValue( String billNoType ){ + + if ( StringUtils.isNull(bussUtils) ){ + throw new BusinessException("缺少必须参数：单据标识"); + } + String value = ""; // + synchronized (BussUtils.class) { + + // 取得单据前缀 + SysMenu menu = bussUtils.menuMapper.selectMenusByEntityId(billNoType) ; + + + // 更新迭加序号 + SysBillNo newbillNo = new SysBillNo(); + newbillNo.setFperiod(DateUtils.getPeriod()); + newbillNo.setBillName(billNoType); + newbillNo.setIterationValue("1"); + newbillNo.setNextValue("1"); + + int resi = bussUtils.sysBillNoMapper.insertDuplicateByPeriod( newbillNo ); + + newbillNo = bussUtils.sysBillNoMapper.selectSysBillNoByPeriod( newbillNo ); + + value = newbillNo.getIterationValue() ; + value = value.format("%05d", value); + + //00001+表单编号BA02+六位数的日期编号+四位数的单据序号 + //String.format("%05d", 77); -->结果为00077 + value = menu.getBillPrefix() + .concat(newbillNo.getFperiod()) + .concat(value) ; + } +// if ( StringUtils.isEmpty(value) ){ +// throw new BusinessException(String.format("未查询到%s相关单据信息,请确认！", billNoType )); +// } + return value; + + } + + +} diff --git a/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml b/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml index 0eac621b0..274da8147 100644 --- a/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml +++ b/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml @@ -15,25 +15,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select econ_id, econ_name, doc_num, status, remark, del_flag, create_by, create_time, update_by, update_time from platf_econ_type + select t.econ_id, t.econ_name, t.doc_num, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, + a1.user_name as a1sysuser, a2.user_name as a2sysuser from platf_econ_type t + left join sys_user a1 on t.create_by=a1.login_name + left join sys_user a2 on t.update_by=a2.login_name - + + insert into platf_econ_type diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java index 039a0ae76..75762dc67 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java @@ -22,7 +22,7 @@ import java.util.List; * 经济类型Controller * * @author dalin - * @date 2020-12-09 + * @date 2020-12-19 */ @Controller @RequestMapping("/platform/econtype") @@ -73,7 +73,8 @@ public class EconTypeController extends BaseController @GetMapping("/add") public String add(ModelMap mmap) { - // 取身份信息 + //
  • $member.key - $member.value.id$member.value.name
    • + // 取身份信息 SysUser user = ShiroUtils.getSysUser(); mmap.put("user", user); @@ -89,7 +90,8 @@ public class EconTypeController extends BaseController @ResponseBody public AjaxResult addSave(EconType econType) { - return toAjax(econTypeService.insertEconType(econType)); + return toAjax(econTypeService.insertEconType(econType) + ); } /** @@ -100,7 +102,6 @@ public class EconTypeController extends BaseController { EconType econType = econTypeService.selectEconTypeById(econId); mmap.put("econType", econType); - return prefix + "/edit"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/SysBillNoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/SysBillNoController.java new file mode 100644 index 000000000..e828986c3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/SysBillNoController.java @@ -0,0 +1,127 @@ +package com.ruoyi.web.controller.platform; + +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.province.platform.domain.SysBillNo; +import com.ruoyi.province.platform.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-19 + */ +@Controller +@RequestMapping("/platform/sysbillno") +public class SysBillNoController extends BaseController +{ + private String prefix = "platform/sysbillno"; + + @Autowired + private ISysBillNoService sysBillNoService; + + @RequiresPermissions("platform:sysbillno:view") + @GetMapping() + public String sysbillno() + { + return prefix + "/sysbillno"; + } + + /** + * 查询单据号迭代信息列表 + */ + @RequiresPermissions("platform:sysbillno:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysBillNo sysBillNo) + { + startPage(); + List list = sysBillNoService.selectSysBillNoList(sysBillNo); + return getDataTable(list); + } + + /** + * 导出单据号迭代信息列表 + */ + @RequiresPermissions("platform:sysbillno:export") + @Log(title = "单据号迭代信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysBillNo sysBillNo) + { + List list = sysBillNoService.selectSysBillNoList(sysBillNo); + ExcelUtil util = new ExcelUtil(SysBillNo.class); + return util.exportExcel(list, "sysbillno"); + } + + /** + * 新增单据号迭代信息 + */ + @GetMapping("/add") + public String add(ModelMap mmap) + { + + return prefix + "/add"; + } + + /** + * 新增保存单据号迭代信息 + */ + @RequiresPermissions("platform:sysbillno:add") + @Log(title = "单据号迭代信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysBillNo sysBillNo) + { + return toAjax(sysBillNoService.insertSysBillNo(sysBillNo)); + } + + /** + * 修改单据号迭代信息 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + SysBillNo sysBillNo = sysBillNoService.selectSysBillNoById(id); + mmap.put("sysBillNo", sysBillNo); + return prefix + "/edit"; + } + + /** + * 修改保存单据号迭代信息 + */ + @RequiresPermissions("platform:sysbillno:edit") + @Log(title = "单据号迭代信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysBillNo sysBillNo) + { + return toAjax(sysBillNoService.updateSysBillNo(sysBillNo)); + } + + /** + * 删除单据号迭代信息 + */ + @RequiresPermissions("platform:sysbillno:remove") + @Log(title = "单据号迭代信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysBillNoService.deleteSysBillNoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css index 98765f7d3..546cac42c 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css +++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css @@ -321,12 +321,18 @@ padding-right: 10px } -/** 表单验证 样式布局 **/ -.control-label.is-required:before { +/** 表单验证 样式布局 before **/ +.control-label.is-required:after { content: '* '; color: red; } +/** 表单验证 样式布局 **/ +.form-control.is-required:after { + content: '* '; + color: red; +} + label.error { position: absolute; right: 18px; diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index ee754b5fe..9e7467055 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -40,7 +40,7 @@
    -

    [[${user.loginName}]]

    +

    [[${user.userName}]]

    在线 注销
    diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html index da7000dc8..35c669546 100644 --- a/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html @@ -2,93 +2,89 @@ - - +
    - -
    - -
    - - -
    - -
    + + - -
    - -
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    - -
    - - -
    -
    - - -
    -
    - - +
    +
    +
    +
    +
    +
    + +
    +
    -
    - -
    - -
    -
    - -
    - - -
    - -
    - - - -
    -
    - - -
    -
    - -
    - -
    - - -
    - -
    - - - -
    -
    - - -
    -
    - -
    -
    +
    + + +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    - - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html index 4d6ef4b7c..27b0c66fc 100644 --- a/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html @@ -92,17 +92,25 @@ title: '备注' }, { - field: 'createBy', + field: 'createByuserName', title: '制单人' }, + { + field: 'createBy', + title: '制单人ID' + }, { field: 'createTime', title: '制单时间' }, { - field: 'updateBy', + field: 'updateByuserName', title: '修改人' }, + { + field: 'updateBy', + title: '修改人ID' + }, { field: 'updateTime', title: '修改时间' diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/edit.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/edit.html index 78d34aa25..6547adbe8 100644 --- a/ruoyi-admin/src/main/resources/templates/platform/econtype/edit.html +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/edit.html @@ -2,11 +2,13 @@ -
    + + + @@ -14,13 +16,15 @@
    - +
    +
    - +
    +
    - +
    @@ -31,21 +35,39 @@
    - +
    + + +
    +
    +
    + +
    + +
    +
    + +
    -
    - -
    - -
    + +
    + +
    +
    + + +
    + +
    +
    @@ -55,16 +77,15 @@
    - +
    +
    +
    -
    - - -
    +
    @@ -72,8 +93,13 @@ - \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java index 4b45f35bd..c90dd3905 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -1,10 +1,11 @@ package com.ruoyi.common.utils; +import org.apache.commons.lang3.time.DateFormatUtils; + import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.commons.lang3.time.DateFormatUtils; /** * 时间工具类 @@ -38,6 +39,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils return new Date(); } + /** + * 获取当前期间, 默认格式为yyyyMM + * + * @return String + */ + public static String getPeriod() + { + return dateTimeNow("YYYYMM"); + } + /** * 获取当前日期, 默认格式为yyyy-MM-dd * diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index 8b22e0053..b011402cf 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.text.CharsetKit; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.exception.BusinessException; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 35d85ab15..b1443f50c 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -11,9 +11,7 @@ import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.system.domain.RelevTable; import org.apache.velocity.VelocityContext; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; public class VelocityUtils { @@ -67,6 +65,9 @@ public class VelocityUtils { velocityContext.put("importList", getImportList(genTable)); velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); + velocityContext.put("billPrefix", genTable.getBillPrefix()); // 单据前缀 + + // 取出页面需要的字段ing List tempcolumns = genTable.getColumns(); List effectivecols = new ArrayList();//定义一个list对象 @@ -76,7 +77,7 @@ public class VelocityUtils { Integer icount = 0 ; - for (GenTableColumn tcolumn : tempcolumns) { + for (GenTableColumn tcolumn : tempcolumns) { if ( !StringUtil.isEmpty( tcolumn.getRelevEntity() ) && !tcolumn.isPk() ) { // 添加 关联字段 信息 @@ -134,7 +135,16 @@ public class VelocityUtils { } }; + // 关联字段的 实体类 + Map conctrolmodelsmap = new HashMap<>(); + for (GenTableColumn hcolumn : hiddenleftjoinfiledcols) { + if (!conctrolmodelsmap.containsKey(hcolumn.getRelevEntity())) { + conctrolmodelsmap.put(hcolumn.getRelevEntity(),hcolumn) ; + } + } + // + velocityContext.put("conctrolmodelsmap", conctrolmodelsmap); velocityContext.put("effectivecols", effectivecols); velocityContext.put("effectiveeditcols", effectiveceditols); // 在界面上 要隐藏的ID diff --git a/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm index 1d0177843..33c788c9c 100644 --- a/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm @@ -50,27 +50,24 @@ #set($cumvar=$cumvar+1) #if($column.htmlType == "textarea") #if($cumvar%2==0) - #end -
    -
    +
    +
    - -
    - + +
    +
    #else #if($cumvar%2==1) -
    -
    +
    #end #parse("\vm\html\col2\formedittpl.vm") #if($cumvar%2==0 || ($cumvar>=$colcount)) -
    #end #end @@ -102,7 +99,6 @@ #end *# - #if($table.sub)

    ${subTable.functionName}信息

    @@ -138,6 +134,11 @@ #end