Skip to content

A
aroad_aqsc
提交 59ad1b66 authored 作者: zhanglongfa's avatar zhanglongfa
浏览文件
操作

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java # src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml
上级 191beccf edff9146
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 357 行增加 和 3 行删除
db/aroad.sql
浏览文件 @ 59ad1b66
......@@ -156,7 +156,6 @@ CREATE TABLE `sys_menu` (
`del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '逻辑删除标记(0--正常 1--删除)',
PRIMARY KEY (`menu_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_menu
-- ----------------------------
......@@ -276,16 +275,33 @@ INSERT INTO `sys_menu` VALUES (33000, '管理决策', NULL, '/zhjcgljc', 30000,
INSERT INTO `sys_menu` VALUES (33100, '人力资源结构分析', '', '/zhjcgljcrlzyjgfx', 33000, 'icon-bangzhushouji', 'views/zhjc/gljcrlzyjgfx/index', 1, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (33200, '年度工作统计', NULL, '/zhjcgljcndgztj', 33000, '1', '', 2, '0', '0', '2019-03-15 10:50:22', '2019-03-15 21:51:39', '0');
INSERT INTO `sys_menu` VALUES (33210, '公路养护/建设规模', '', '/zhjcgljcndgztjglyhjsgm', 33200, 'icon-bangzhushouji', 'views/zhjc/gljcndgztj/glyhjsgm/index', 1, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (33220, '养护里程', '', '/zhjcgljcndgztjyhlc', 33200, 'icon-bangzhushouji', 'views/zhjc/gljcndgztj/yhlc/index', 2, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (33230, '督查情况反馈统计', '', '/zhjcgljcndgztjdcqkfktj', 33200, 'icon-bangzhushouji', 'views/zhjg/zhjgdckhdbtj/index', 3, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (33240, '信息报送情况统计', '', '/zhjcgljcndgztjxxbsqktj', 33200, 'icon-bangzhushouji', 'views/zhjc/gljcndgztj/xxbsqktj/index', 4, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (33250, '行政审批办理情况', '', '/zhjcgljcndgztjxzspblqk', 33200, 'icon-bangzhushouji', 'views/zhjc/gljcndgztj/xzspblqk/index', 5, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (33260, '量化统计', '', '/zhjcgljcndgztjlhtj', 33200, 'icon-bangzhushouji', 'views/zhjc/gljcndgztj/lhtj/index', 6, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (40000, '智慧建设', NULL, '/crud', -1, 'icon-caidanguanli', '', 4, '0', '0', '2019-03-15 01:50:22', '2018-09-28 08:58:20', '0');
INSERT INTO `sys_menu` VALUES (40000, '智慧建设', NULL, '/zhjs', -1, 'icon-caidanguanli', '', 4, '0', '0', '2019-03-15 01:50:22', '2019-04-08 10:06:25', '0');
INSERT INTO `sys_menu` VALUES (41000, '综合展示', '', '/zhjszhzs', 40000, 'icon-bangzhushouji', 'views/zhjs/zhjszhzs/index', 0, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (42000, '工程项目', '', '/zhjsgcxm', 40000, 'icon-bangzhushouji', 'views/zhjs/zhjsgcxm/index', 1, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (43000, '合同管理', '', '/zhjshtgl', 40000, 'icon-bangzhushouji', 'views/zhjs/zhjshtgl/index', 2, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (44000, '计量支付', '', '/zhjsjlzf', 40000, 'icon-bangzhushouji', 'views/zhjs/zhjsjlzf/index', 3, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (45000, '统计分析', '', '/zhjstjfx', 40000, 'icon-bangzhushouji', '', 4, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (45100, '改建工程进展情况', '', '/zhjstjfxgjgcjzqk', 45000, 'icon-bangzhushouji', 'views/zhjs/zhjstjfxgjgcjzqk/index', 1, '0', '0', '2018-01-20 13:17:19', '2019-04-08 10:15:24', '0');
INSERT INTO `sys_menu` VALUES (45200, '投资完成情况分析', '', '/zhjstjfxtzwcqkfx', 45000, 'icon-bangzhushouji', 'views/zhjs/zhjstjfxtzwcqkfx/index', 2, '0', '0', '2018-01-20 13:17:19', '2019-04-08 10:15:27', '0');
INSERT INTO `sys_menu` VALUES (50000, '智慧养护', NULL, '/crud', -1, 'icon-caidanguanli', '', 5, '0', '0', '2019-03-15 01:50:22', '2018-09-28 08:58:20', '0');
INSERT INTO `sys_menu` VALUES (60000, '智慧监管', NULL, '/zhjg', -1, 'icon-caidanguanli', '', 6, '0', '0', '2019-03-15 01:50:22', '2019-03-15 08:58:26', '0');
INSERT INTO `sys_menu` VALUES (61000, '督查考核', NULL, '/zhjgdckh', 60000, '1', '', 1, '0', '0', '2019-03-15 10:50:22', '2019-03-15 21:51:39', '0');
INSERT INTO `sys_menu` VALUES (61100, '督查任务', 'zhjg_zhjgdchrrw', '/zhjgdchrw', 61000, 'icon-bangzhushouji', 'views/zhjg/zhjgdckhrw/index', 7, '0', '0', '2019-04-04 01:53:30', '2019-04-04 01:55:39', '0');
INSERT INTO `sys_menu` VALUES (61101, '新建任务', 'zhjg_zhjgdckhrw_add', NULL, 61100, NULL, NULL, NULL, '0', '1', '2019-03-08 10:14:18', '2019-03-08 09:07:46', '0');
INSERT INTO `sys_menu` VALUES (61102, '修改', 'zhjg_zhjgdckhrw_edit', NULL, 61100, NULL, NULL, NULL, '0', '1', '2019-03-08 10:14:18', '2019-03-08 09:07:46', '0');
INSERT INTO `sys_menu` VALUES (61103, '删除', 'zhjg_zhjgdckhrw_del', NULL, 61100, NULL, NULL, NULL, '0', '1', '2019-03-08 10:14:18', '2019-03-08 09:07:46', '0');
INSERT INTO `sys_menu` VALUES (61104, '下发', 'zhjg_zhjgdckhrw_down', NULL, 61100, NULL, NULL, NULL, '0', '1', '2019-03-08 10:14:18', '2019-03-08 09:07:46', '0');
INSERT INTO `sys_menu` VALUES (61105, '催办', 'zhjg_zhjgdckhrw_cb', NULL, 61100, NULL, NULL, NULL, '0', '1', '2019-03-08 10:14:18', '2019-03-08 09:07:46', '0');
INSERT INTO `sys_menu` VALUES (61106, '查看', 'zhjg_zhjgdckhrw_view', NULL, 61100, NULL, NULL, NULL, '0', '1', '2019-03-08 10:14:18', '2019-04-16 07:41:35', '0');
INSERT INTO `sys_menu` VALUES (61110, '待办任务', 'zhjg_zhjgdckhrwff', NULL, 61100, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0');
INSERT INTO `sys_menu` VALUES (61111, '接收', 'zhjg_zhjgdckhrw_js', NULL, 61100, '1', NULL, 1, '0', '1', '2018-05-15 21:35:18', '2019-04-16 07:39:25', '0');
INSERT INTO `sys_menu` VALUES (61112, '反馈', 'zhjg_zhjgdckhrw_fk', NULL, 61100, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2019-04-16 07:39:29', '0');
INSERT INTO `sys_menu` VALUES (61200, '督察通告', '', '/zhjgdckhdctg', 61000, 'icon-bangzhushouji', 'views/zhjg/zhjgdckhdctg/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0');
INSERT INTO `sys_menu` VALUES (61201, '督察通告新增', 'zhjg_dckhdctg_add', NULL, 61200, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0');
INSERT INTO `sys_menu` VALUES (61202, '督察通告修改', 'zhjg_dckhdctg_edit', NULL, 61200, '1', NULL, 1, '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0');
INSERT INTO `sys_menu` VALUES (61203, '督察通告删除', 'zhjg_dckhdctg_del', NULL, 61200, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0');
......
db/attendance.sql 0 → 100644
浏览文件 @ 59ad1b66
-- MySQL Script generated by MySQL Workbench
-- Mon Apr 15 09:33:45 2019
-- Model: New Model Version: 1.0
-- MySQL Workbench Forward Engineering
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';
-- -----------------------------------------------------
-- Schema aroad
-- -----------------------------------------------------
-- -----------------------------------------------------
-- Schema aroad
-- -----------------------------------------------------
CREATE SCHEMA IF NOT EXISTS `aroad` DEFAULT CHARACTER SET utf8 ;
USE `aroad` ;
-- -----------------------------------------------------
-- Table `aroad`.`attendance_templates`
-- -----------------------------------------------------
DROP TABLE IF EXISTS `aroad`.`attendance_templates` ;
CREATE TABLE `attendance_templates` (
`shift_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '班次id',
`shift_name` varchar(100) NOT NULL COMMENT '模板名称',
`start_time` time NOT NULL COMMENT '开始时间',
`end_time` time NOT NULL COMMENT '结束时间',
`shift_type` varchar(20) NOT NULL COMMENT '班次类型：白班/夜班/全天/领导带班',
`attendance_type` varchar(20) NOT NULL COMMENT '值班类型',
`is_cross_day` varchar(1) NOT NULL COMMENT '是否跨日',
`position` varchar(20) NOT NULL COMMENT '所属岗位',
`unit_id` int(11) unsigned NOT NULL COMMENT '单位部门id',
`remark` varchar(50) DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`shift_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='班次表';
-- -----------------------------------------------------
-- Table `aroad`.`attendance`
-- -----------------------------------------------------
DROP TABLE IF EXISTS `aroad`.`attendance` ;
CREATE TABLE `attendance` (
`attendance_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '排班id',
`shift_id` int(11) NOT NULL COMMENT '班次表主键',
`time` date NOT NULL COMMENT '排班日期',
`unit_id` int(11) NOT NULL COMMENT '排班部门id',
PRIMARY KEY (`attendance_id`),
KEY `shift_id_index` (`shift_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='排班表';
ALTER TABLE `attendance` ADD UNIQUE `unique_index` (shift_id, time, unit_id);
-- -----------------------------------------------------
-- Table `aroad`.`attendance_members`
-- -----------------------------------------------------
DROP TABLE IF EXISTS `aroad`.`attendance_members` ;
CREATE TABLE `attendance_members` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`attendance_id` int(11) NOT NULL,
`name` varchar(10) NOT NULL COMMENT '值班人员姓名',
`phone` varchar(15) NOT NULL COMMENT '手机号',
PRIMARY KEY (`id`),
KEY `attendance_id_index` (`attendance_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='值班人员表';
-- -----------------------------------------------------
-- Table `aroad`.`attendance_logs`
-- -----------------------------------------------------
DROP TABLE IF EXISTS `aroad`.`attendance_logs` ;
CREATE TABLE `attendance_logs` (
`log_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '日志id',
`duty_person` varchar(10) NOT NULL COMMENT '值班人',
`attendance_shift` varchar(45) NOT NULL COMMENT '值班班次',
`attendance_date` date NOT NULL COMMENT '值班日期',
`content` text NOT NULL COMMENT '日志内容',
`write_id` int(11) NOT NULL COMMENT '填写人id',
`write_person` varchar(10) NOT NULL COMMENT '填写人',
`write_time` datetime NOT NULL COMMENT '填写时间',
`dept_id` int(11) NOT NULL COMMENT '部门id',
PRIMARY KEY (`log_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='值班日志表';
SET SQL_MODE=@OLD_SQL_MODE;
SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
INSERT INTO `sys_menu` (
`parent_id`,
`component`,
`permission`,
`type`,
`path`,
`icon`,
`menu_id`,
`del_flag`,
`create_time`,
`sort`,
`update_time`,
`name`
)
VALUES
(
'-1',
'',
'',
'0',
'/attendance',
'icon-bangzhushouji',
'8000',
'0',
'2018-01-20 13:17:19',
'9',
'2018-07-29 13:38:19',
'值班管理'
);
-- 菜单SQL
INSERT INTO `sys_menu` (
`parent_id`,
`component`,
`permission`,
`type`,
`path`,
`icon`,
`menu_id`,
`del_flag`,
`create_time`,
`sort`,
`update_time`,
`name`
)
VALUES
(
'8000',
'views/attendance/attendance/index',
'',
'0',
'/attendance',
'icon-bangzhushouji',
'8100',
'0',
'2018-01-20 13:17:19',
'2',
'2018-07-29 13:38:19',
'排班管理'
);
-- 菜单SQL
INSERT INTO `sys_menu` (
`parent_id`,
`component`,
`permission`,
`type`,
`path`,
`icon`,
`menu_id`,
`del_flag`,
`create_time`,
`sort`,
`update_time`,
`name`
)
VALUES
(
'8000',
'views/attendance/attendancetemplates/index',
'',
'0',
'/attendancetemplates',
'icon-bangzhushouji',
'8200',
'0',
'2018-01-20 13:17:19',
'1',
'2018-07-29 13:38:19',
'班次管理'
);
-- 值班日志
INSERT INTO `sys_menu` (
`parent_id`,
`component`,
`permission`,
`type`,
`path`,
`icon`,
`menu_id`,
`del_flag`,
`create_time`,
`sort`,
`update_time`,
`name`
)
VALUES
(
'8000',
'views/attendance/attendancelogs/index',
'',
'0',
'/attendancelogs',
'icon-bangzhushouji',
'8300',
'0',
'2018-01-20 13:17:19',
'1',
'2018-07-29 13:38:19',
'值班日志'
);
-- 添加排班
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8100', null, 'attendance_add', '1', null, '1', '8101', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '添加排班');
-- 撤销排班
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8100', null, 'attendance_remove', '1', null, '1', '8102', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '撤销排班');
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8200', null, 'attendancetemplates_add', '1', null, '1', '8201', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '新增');
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8200', null, 'attendancetemplates_edit', '1', null, '1', '8202', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '修改');
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8200', null, 'attendancetemplates_del', '1', null, '1', '8203', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '删除');
-- 值班日志操作权限
INSERT INTO `sys_menu` (
`parent_id`,
`component`,
`permission`,
`type`,
`path`,
`icon`,
`menu_id`,
`del_flag`,
`create_time`,
`sort`,
`update_time`,
`name`
)
VALUES
(
'8300',
NULL,
'logs_add',
'1',
NULL,
'1',
'8301',
'0',
'2018-05-15 21:35:18',
'0',
'2018-07-29 13:38:59',
'新增'
);
INSERT INTO `sys_menu` (
`parent_id`,
`component`,
`permission`,
`type`,
`path`,
`icon`,
`menu_id`,
`del_flag`,
`create_time`,
`sort`,
`update_time`,
`name`
)
VALUES
(
'8300',
NULL,
'logs_edit',
'1',
NULL,
'1',
'8302',
'0',
'2018-05-15 21:35:18',
'1',
'2018-07-29 13:38:59',
'修改'
);
INSERT INTO `sys_menu` (
`parent_id`,
`component`,
`permission`,
`type`,
`path`,
`icon`,
`menu_id`,
`del_flag`,
`create_time`,
`sort`,
`update_time`,
`name`
)
VALUES
(
'8300',
NULL,
'logs_del',
'1',
NULL,
'1',
'8303',
'0',
'2018-05-15 21:35:18',
'2',
'2018-07-29 13:38:59',
'删除'
);
-- 菜单SQL
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8000', 'views/attendance/attendancerecords/index_manage', '', '0', '/recordsmanage', 'icon-bangzhushouji', '8400', '0', '2018-01-20 13:17:19', '8', '2018-07-29 13:38:19', '通讯录管理');
-- 菜单对应按钮SQL
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8400', null, 'attendancerecords_add', '1', null, '1', '8401', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '新增');
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8400', null, 'attendancerecords_edit', '1', null, '1', '8402', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '修改');
insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '8400', null, 'attendancerecords_del', '1', null, '1', '8403', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '删除');
db/emergency/应急物资.sql 0 → 100644
浏览文件 @ 59ad1b66
This source diff could not be displayed because it is too large. You can view the blob instead.
db/emergency/应急组织.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/emergency/应急装备.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/emergency/应急车辆.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/emergency/应急队伍.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/emergency/应急队伍装备信息.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/emergency/资源库.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/emergency_plan.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/info.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/road_condition_event.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
db/zhtj/zhtj.sql 0 → 100644
浏览文件 @ 59ad1b66
差异被折叠。
pom.xml
浏览文件 @ 59ad1b66
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论