文书档案

project_data/sql/0.0.2/soc/soc.sql

@@ -952,6 +952,57 @@ CREATE TABLE `core_safety_index_calculate_rule_item` (
      PRIMARY KEY (`id`) USING BTREE,
      KEY `rule_id` (`rule_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指标指数细化表';
+
+-- 新增安全检查相关表
+DROP TABLE IF EXISTS `core_safety_book_aqbwbndjh`;
+CREATE TABLE `core_safety_book_aqbwbndjh` (
+                                              `id` bigint NOT NULL,
+                                              `title` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '工作主题',
+                                              `date` datetime DEFAULT NULL COMMENT '记录日期',
+                                              `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容',
+                                              `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                              `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+                                              `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                              `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                              `images` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '照片',
+                                              `org_id` bigint DEFAULT NULL COMMENT '机构id',
+                                              PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全保卫部年度计划';
+DROP TABLE IF EXISTS `core_safety_book_aqbwbndjh_user`;
+CREATE TABLE `core_safety_book_aqbwbndjh_user` (
+                                                   `id` bigint NOT NULL,
+                                                   `aqbwbndjh_id` bigint DEFAULT NULL COMMENT '安全保卫部年度计划id',
+                                                   `user_id` bigint DEFAULT NULL COMMENT '用户id',
+                                                   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                                   `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+                                                   `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                                   `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                                   PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+DROP TABLE IF EXISTS `core_safety_book_hsggbsdj`;
+CREATE TABLE `core_safety_book_hsggbsdj` (
+                                             `id` bigint NOT NULL,
+                                             `title` varchar(4000) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '工作主题',
+                                             `date` datetime DEFAULT NULL COMMENT '开会日期',
+                                             `content` longtext COLLATE utf8mb4_general_ci COMMENT '内容',
+                                             `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                             `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+                                             `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                             `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                             `images` varchar(4000) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '照片',
+                                             PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='行社高管部署登记';
+DROP TABLE IF EXISTS `core_safety_book_hsggbsdj_user`;
+CREATE TABLE `core_safety_book_hsggbsdj_user` (
+                                                  `id` bigint NOT NULL,
+                                                  `hsggbsdj_id` bigint DEFAULT NULL COMMENT '行社高管部署登记id',
+                                                  `user_id` bigint DEFAULT NULL COMMENT '用户id',
+                                                  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                                  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+                                                  `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                                  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                                  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 -- -------------------------------------------------------
 -- ----------新增表脚本 end ----------------------------
 -- -------------------------------------------------------
@@ -1520,10 +1571,29 @@ INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, quer
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2229, '演练计划删除', 2321, 5, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:remove', '1', null, null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2338, '演练计划详情', 2321, 6, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:query', '1', null, null, '超级管理员', now(), '', null, '');
 
--- 安全责任书菜单
-delete from sys_menu where menu_name in ('文书档案','安全责任书');
+-- 安全责任书,文书档案,行社高管部署登记,安全保卫部年度计划菜单
+DELETE FROM sys_menu WHERE menu_name IN ('文书档案','安全责任书');
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01711912586825461761, '文书档案', 0, 12, 'safetyBook', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '1', 'documentation', NULL, '超级管理员', '2023-10-11 09:12:38', '', NULL, '');
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01711913107380531202, '安全责任书', 1711912586825461761, 1, 'index', 'safetyBook/index', NULL, 1, 0, 'C', '0', '0', NULL, '1', 'clipboard', NULL, '超级管理员', '2023-10-11 09:14:42', '', NULL, '');
+DELETE FROM sys_menu WHERE parent_id IN (1711913107380531202);
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717348743654797314, '列表', 1711913107380531202, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:book:list', '1', NULL, NULL, '超级管理员', '2023-10-26 09:14:03', '超级管理员', '2023-10-26 09:15:25', '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717348861602820098, '详情', 1711913107380531202, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:book:query', '1', NULL, NULL, '超级管理员', '2023-10-26 09:14:32', '超级管理员', '2023-10-26 09:15:30', '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717348927302397954, '新增', 1711913107380531202, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:book:add', '1', NULL, NULL, '超级管理员', '2023-10-26 09:14:47', '超级管理员', '2023-10-26 09:15:35', '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717349049847377921, '删除', 1711913107380531202, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:book:remove', '1', NULL, NULL, '超级管理员', '2023-10-26 09:15:16', '', NULL, '');
+DELETE FROM sys_menu WHERE menu_name IN ('行社高管部署登记','安全保卫部年度计划');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717358753591980034, '行社高管部署登记', 1711912586825461761, 2, 'safetyBook/hsggbsdj', 'safetyBook/hsggbsdj/index', NULL, 1, 0, 'C', '0', '0', '', '1', 'clipboard', NULL, '超级管理员', '2023-10-26 09:53:50', '超级管理员', '2023-10-26 09:54:58', '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717358984232562689, '安全保卫部年度计划', 1711912586825461761, 3, 'safetyBook/aqbwbndjh', 'safetyBook/aqbwbndjh/index', NULL, 1, 0, 'C', '0', '0', NULL, '1', 'documentation', NULL, '超级管理员', '2023-10-26 09:54:45', '', NULL, '');
+DELETE FROM sys_menu WHERE parent_id IN (1717358753591980034,1717358984232562689);
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371294217007105, '查询', 1717358753591980034, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:hsggbsdj:list', '1', NULL, NULL, '超级管理员', '2023-10-26 10:43:40', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371373241888769, '详情', 1717358753591980034, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:hsggbsdj:query', '1', NULL, NULL, '超级管理员', '2023-10-26 10:43:59', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371444800909314, '新增', 1717358753591980034, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:hsggbsdj:add', '1', NULL, NULL, '超级管理员', '2023-10-26 10:44:16', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371509552574466, '修改', 1717358753591980034, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:hsggbsdj:edit', '1', NULL, NULL, '超级管理员', '2023-10-26 10:44:31', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371575478644737, '删除', 1717358753591980034, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:hsggbsdj:remove', '1', NULL, NULL, '超级管理员', '2023-10-26 10:44:47', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371668365701121, '列表', 1717358984232562689, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:aqbwbndjh:list', '1', NULL, NULL, '超级管理员', '2023-10-26 10:45:09', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371766013292545, '详情', 1717358984232562689, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:aqbwbndjh:query', '1', NULL, NULL, '超级管理员', '2023-10-26 10:45:32', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371829741547522, '新增', 1717358984232562689, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:aqbwbndjh:add', '1', NULL, NULL, '超级管理员', '2023-10-26 10:45:48', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371889652985857, '修改', 1717358984232562689, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:aqbwbndjh:edit', '1', NULL, NULL, '超级管理员', '2023-10-26 10:46:02', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01717371943881142274, '删除', 1717358984232562689, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:aqbwbndjh:remove', '1', NULL, NULL, '超级管理员', '2023-10-26 10:46:15', '', NULL, '');
 
 
 -- Web演练任务按钮及权限

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/controller/CoreSafetyBookController.java

@@ -37,7 +37,7 @@ public class CoreSafetyBookController extends BaseController {
      * 查询【安全检查责任书】列表
      */
     @ApiOperation(value = "查询CoreSafetyBook列表")
-    @RequiresPermissions("system:book:list")
+    @RequiresPermissions("core:book:list")
     @PostMapping("/list")
     public TableDataInfo<CoreSafetyBook> list(@RequestBody CoreSafetyBook coreSafetyBook) {
 
@@ -49,7 +49,7 @@ public class CoreSafetyBookController extends BaseController {
      * 获取【安全检查责任书】详细信息
      */
     @ApiOperation(value = "获取CoreSafetyBook详细信息")
-    @RequiresPermissions("system:book:query")
+    @RequiresPermissions("core:book:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreSafetyBookService.selectCoreSafetyBookById(id));
@@ -59,7 +59,7 @@ public class CoreSafetyBookController extends BaseController {
      * 新增/编辑【安全检查责任书】
      */
     @ApiOperation(value = "新增CoreSafetyBook")
-    @RequiresPermissions("system:book:add")
+    @RequiresPermissions("core:book:add")
     @Log(title = "【安全检查责任书】", businessType = BusinessType.INSERT)
     @PostMapping("/editOrAdd")
     public AjaxResult editOrAdd(@RequestBody CoreSafetyBook coreSafetyBook) {
@@ -72,7 +72,7 @@ public class CoreSafetyBookController extends BaseController {
      * 删除【安全检查责任书】
      */
     @ApiOperation(value = "删除CoreSafetyBook")
-    @RequiresPermissions("system:book:remove")
+    @RequiresPermissions("core:book:remove")
     @Log(title = "【安全检查责任书】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookUserMapper.xml

@@ -23,7 +23,6 @@
                update_by,
                update_time,
                book_id,
-               user_id,
                time,
                files
         from core_safety_book_user
@@ -67,7 +66,7 @@
                u.time,
                u.files,
                group_concat(su.name) as user_name,
-               group_concat(su.id) as user_id
+               group_concat(su.id)   as user_id
         from core_safety_book_user u
                  left join core_safety_book_user_id ui on u.id = ui.book_user_id
                  left join sys_user su on su.id = ui.user_id