Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -116,7 +116,7 @@ CREATE TABLE `core_evaluate_task_user` (
                                            `task_id` bigint DEFAULT NULL COMMENT '任务id',
                                            `user_id` bigint DEFAULT NULL COMMENT '评价人id',
                                            `complete_time` datetime DEFAULT NULL COMMENT '评价时间',
-                                           `evaluated_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价人名称',
+                                           `evaluate_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价人名称',
                                            PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='外包评价任务评价人信息表';
 DROP TABLE
@@ -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 ----------------------------
 -- -------------------------------------------------------
@@ -1548,10 +1599,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演练任务按钮及权限
@@ -1910,8 +1980,8 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 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 (00000000000000002318, '检查任务', 2326, 4, 'check/task/index', 'check/task/index', NULL, 1, 0, 'C', '0', '0', '', '1', 'documentation', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 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 (01706239529069875202, '下发', 2317, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:checkplan:distribute', '1', '#', NULL, '超级管理员', '2023-09-26 09:56:04', '', 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 (00000000000000002214, '隐患问题清单', 2136, 4, '/problemItem', NULL, NULL, 1, 0, 'M', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcEzNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXNmKXc/5sSAAAAEHRSTlMA4NAQ8DBgQIDAoHAgUJCwaDv5MQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAltJREFUWIXtmN12qyAQRkf+FUx4/6c9C4QaZQYwC08v6neTNqm7hIHNKDx58uSXwlfzRXRrsEb4b2Ia2OUrapNrv8S2uJP3flJuHszVAcsBRnON917BPVx94moytpv78t7DiVuftT7ufBM3jFfewOWzn+8Yb84d3OCdaTy38M4YbumdIVxVYMdww8QKI0fXDfPOCC7mnVHc/+Wdvlz3zggu5p0RXDeV3hnB/ZyP4Vx99M4grn36HQAQ0TuaDeaGHS8u9TtsZh3c4Afbu86m18rjVU4t4rp3iMyxk47+cYHd5EIPl2mAdflZ5rOpc3u9YwDUae8sNfLS5R2hQJYrRlia6ybPmuMVEjtevfdvXp2MFlcRWO9ZFaxt1TuGxPrty+KxDZcxkJVPX7XKVaMB/cevpEHi/rDpnTmu8SIKpKjNRPSOqnhnRYcbeo4EXtGSbcuIXg8TrAQ2g98Yt3mftWAF2LDAt2+JrbWmdxSUU5SwLn2CVa7pHQ35J5HPwYSV+XfMmE3vcJexMoHOWJTb9E7uIUNxAyq8HrFbY3OKbHkncTecFAgW5X7OBxrH47sJ5xAsfdLJlfZOqttRXAcsxV2r3jFpnTG5X6GPHRJuiIZ33rGV9XvBylsoFEurNYVnS2bw+Qp0H0epsJp37I93NrA+/wE6De3nO9M+QKHOJSNXWcfzHfNhCFVgiap19DvCfZxDBZZYZD39DqsUl9prXf3Ocv2c7+t3KPBCtg9SbN6R9M1rCAdd7spaH9XqN/fw83MVerBXo957vewwaozU1ljdfFb95M/nSQoA/AN/gr7nzB2jDwAAAABJRU5ErkJggg==', NULL, '超级管理员', '2023-09-20 15:14:35', '超级管理员', '2023-09-20 17:47:12', '');
-
-
+DELETE FROM sys_menu WHERE id in(01717447477334949890);
+INSERT INTO `sys_menu` VALUES (01717447477334949890, '外包评价', 2136, 1, '/resumptionEvaluate', NULL, NULL, 1, 0, 'M', '0', '0', '', '0', '/statics/2023/09/16/20230916232743A004.png', NULL, '超级管理员', '2023-09-08 11:20:51', '超级管理员', '2023-09-16 23:27:44', '');
 DELETE FROM sys_menu WHERE id IN(01717082444588490754,01717082281321013249,01717081940877746178,01717081756911378434,01717076927401005058,01717079254782545922,01717080888703033346,01717081123747635202,01717081262801395714,01717081426194702337,01717081639428923393);
 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 (01717076927401005058, '评价计划管理', 00000000000000002000, 1, 'resumption', 'resumptionEvaluate/evaluate/index', NULL, 1, 1, 'C', '0', '0', 'core:evaluatePlan:list', '1', 'excel', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
@@ -2062,7 +2132,7 @@ INSERT INTO core_safety_dict (id, code, parent_code, name) VALUES (60, '100502',
 INSERT INTO core_safety_dict (id, code, parent_code, name) VALUES (61, '10050201', '100502', '已确认但未在规定时间内完成整改');
 INSERT INTO core_safety_dict (id, code, parent_code, name) VALUES (62, '1006', '-1', '监控调阅');
 INSERT INTO core_safety_dict (id, code, parent_code, name) VALUES (63, '100601', '1006', '监控调阅-未登');
-INSERT INTO core_safety_dict (id, code, parent_code, name) VALUES (64, '10060101', '100601', '未登-网点安全员(每周)');
+INSERT INTO core_safety_dict (id, code, parent_code, name) VALUES (64, '10060101', '100601', '未登-网点负责人(每周)');
 
 
 INSERT INTO core_safety_index_calculate_rule (id, type_code, project_code, point_code, deduction_type, score, formula, org_type, deleted, cycle, remark, create_time, create_by, update_time, update_by) VALUES (3846713285328896, '1005', '100501', '10050101', 2, 10, '扣分=问题数量*K+风险等级为“重大”的问题数量*K1+风险等级为“关注”的问题数量*K2+风险等级为“一般”的问题数量*K3+风险等级为“轻微”的问题数量*K4；得分大于10，取分值10。K为调节系数，可变更，建议测试期间K=0.05；K1=0.05；K2=0.15；K3=0.2；K4=0.25。', 3, 0, null, null, now(), null, now(), null);
@@ -2138,7 +2208,13 @@ INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note,
 INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345560989697, 1714172822255894529, '连续三次未登', 2, 3, null, 1, 0, now(), null, now(), null);
 INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345565184002, 1714172822255894529, '连续五次未登', 2, 5, null, 1, 0, now(), null, now(), null);
 INSERT INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345569378306, 1714172822255894529, '连续十次未登', 2, 10, null, 1, 0, now(), null, now(), null);
-
+delete from sys_dict_type where dict_type='evaluate_status';
+delete from sys_dict_data where dict_type='evaluate_status';
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ('评价状态', 'evaluate_status', '0', 'slsjyc', now(), '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+VALUES (0, '未评价', '0', 'evaluate_status', null, 'default', 'N', '0', 'slsjyc', now(), 'slsjyc', now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+VALUES (2, '已评价', '2', 'evaluate_status', null, 'default', 'N', '0', 'slsjyc', now(), 'slsjyc', now(), null);
 
 -- 新增教育培训资料类型字典
 delete from sys_dict_type where dict_type='edu_materials_type';

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -437,7 +437,11 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 trainingTask.setId(IdWorker.getId());
                 trainingTask.setPlanId(plan.getId());
                 trainingTask.setPlanCycle(plan.getPlanCycle());
-                trainingTask.setTitle(plan.getPlanName());
+                if (plan.getExecTimes() > 1) {
+                    trainingTask.setTitle(plan.getPlanName() + "第" + i + "次演练");
+                } else {
+                    trainingTask.setTitle(plan.getPlanName());
+                }
                 trainingTask.setStartDate(DateUtils.getPreciseTime(dateRangeMap.get(i).getStartTime()));
                 trainingTask.setEndDate(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
                 trainingTask.setPresetCase(null);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -486,7 +486,12 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                 trainingTask.setStartDate(DateUtils.getPreciseTime(dateRange.getStartTime()));
                 trainingTask.setEndDate(DateUtils.getPreciseTime(dateRange.getEndTime()));
                 trainingTask.setContent(null);
-                trainingTask.setTitle(plan.getPlanName());
+                if (plan.getExecTimes()>1){
+                    trainingTask.setTitle(plan.getPlanName()+"第"+i+"次培训");
+                }else {
+                    trainingTask.setTitle(plan.getPlanName());
+                }
+
                 trainingTask.setNote(null);
                 trainingTask.setTrainingStartDateTime(null);
                 trainingTask.setTrainingEndDateTime(null);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluatePlanServiceImpl.java

@@ -158,15 +158,15 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
             coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
         });
         //固定
-        CoreEvaluateContent coreEvaluateContent = new CoreEvaluateContent();
+/*        CoreEvaluateContent coreEvaluateContent = new CoreEvaluateContent();
         coreEvaluateContent.setCode(1L);
         coreEvaluateContent.setContentType("1");
         coreEvaluateContent.setContent("被评价外包公司名称");
-        coreEvaluateContentMapper.insert(coreEvaluateContent);
-        CoreEvaluatePlanContent coreEvaluatePlanContent = new CoreEvaluatePlanContent();
+        coreEvaluateContentMapper.insert(coreEvaluateContent);*/
+    /*    CoreEvaluatePlanContent coreEvaluatePlanContent = new CoreEvaluatePlanContent();
         coreEvaluatePlanContent.setContentId(coreEvaluateContent.getId());
         coreEvaluatePlanContent.setEvaluateId(planId);
-        coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
+        coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);*/
         return insert;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -4,6 +4,7 @@ package com.xunmei.core.evaluate.service.impl;
 import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -200,10 +201,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
                 coreEvaluateTaskVO.setEvaluateCycle("每年");
                 break;
         }
-
-        List<CoreEvaluateTaskContent> coreEvaluateContentList = new ArrayList<>();
         //已完成
-        List<CoreEvaluateTaskUserContentVO> coreEvaluateTaskUserContentVOS = null;
+        List<CoreEvaluateTaskUserContentVO> coreEvaluateTaskUserContentVOS = new ArrayList<>();
         if (coreEvaluateTask.getStatus().equals("2")) {
             //评价人中间表
             List<CoreEvaluateTaskUser> infoByTaskId = coreEvaluateTaskUserMapper.getInfoByTaskId(id);
@@ -216,14 +215,6 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
                 coreEvaluateTaskUserContentVOS.add(coreEvaluateTaskUserContentVO);
            }
         }
-  /*      else {
-            List<CoreEvaluateContent> byEvaluateId = coreEvaluateContentMapper.getByEvaluateId(coreEvaluateTask.getPlanId());
-            for (CoreEvaluateContent c : byEvaluateId) {
-                CoreEvaluateTaskContent coreEvaluateTaskContent = new CoreEvaluateTaskContent();
-                BeanUtils.copyProperties(c, coreEvaluateTaskContent);
-                coreEvaluateContentList.add(coreEvaluateTaskContent);
-            }
-        }*/
         coreEvaluateTaskVO.setCoreEvaluateTaskUserContentVOS(coreEvaluateTaskUserContentVOS);
         return coreEvaluateTaskVO;
     }
@@ -263,9 +254,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     public int updateCoreEvaluateTask(EvaluateTaskContentDTO evaluateTaskContentDTO) {
         //查询任务
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(evaluateTaskContentDTO.getId());
-        if (!SecurityUtils.getLoginUser().getOrgId().equals(coreEvaluateTask.getOrgId())) {
+ /*       if (!SecurityUtils.getLoginUser().getOrgId().equals(coreEvaluateTask.getOrgId())) {
             throw new RuntimeException("您没有该任务的评价权限");
-        }
+        }*/
         List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(coreEvaluateTask.getPlanId());
         List<SysRole> roleByUserId = remoteRoleService.getRoleByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
         List<Long> collect = roleByUserId.stream().map(SysRole::getId).collect(Collectors.toList());
@@ -293,6 +284,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         coreEvaluateTaskUserMapper.insert(coreEvaluateTaskUser);
         //再重新添加任务内容
         evaluateTaskContentDTO.getCoreEvaluateTaskContentList().forEach(e -> {
+            e.setId(IdWorker.getId());
             e.setTaskUserId(coreEvaluateTaskUser.getId());
             coreEvaluateTaskContentMapper.insert(e);
         });

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionServiceImpl.java

@@ -4,8 +4,6 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.nacos.shaded.com.google.gson.Gson;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -16,9 +14,7 @@ import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.ResumptionType;
 import com.xunmei.common.core.utils.Ymd;
-import com.xunmei.core.TaskCreatingServiceImplBase;
 import com.xunmei.core.resumption.domain.AppPlan;
-import com.xunmei.core.resumption.domain.AppPlanToRole;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.TaskDetailsDto;
 import com.xunmei.core.resumption.dto.resumptionRegister.ResumptionTaskDataDto;
@@ -32,14 +28,15 @@ import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
 import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysRole;
-import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumption> implements ResumptionService {
@@ -310,7 +307,7 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
 
     @Override
     public List<CoreSafetyExceptionData> findResumptionList(DateTime time) {
-        SysRole role = roleService.getRoleByName("网点安全员", SecurityConstants.FROM_SOURCE);
+        SysRole role = roleService.getRoleByName("网点安全员", SecurityConstants.INNER);
         return baseMapper.findResumptionExceptionList(time.year(), time.quarter(), time.month() + 1, role.getId());
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -175,4 +175,6 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
     List<CoreSafetyExceptionData> selectMonitorNumsExceptionData(@Param("time") DateTime time);
 
     List<CoreMonitoringRetrievalTask> selectTaskList(@Param("taskTime") LocalDate taskTime, @Param("orgIds") List<Long> orgIds, @Param("cycle") Integer cycle);
+
+    List<CoreSafetyExceptionData> selectMonitorExceptionData(@Param("year") int year, @Param("quarter") int quarter, @Param("month") int month, @Param("roleId") Long roleId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -21,15 +21,14 @@ import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTas
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.common.core.domain.retrieval.vo.*;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
-import com.xunmei.common.core.enums.edu.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.xunmei.common.core.domain.worktime.dto.WorkTimeDto;
 import com.xunmei.common.core.enums.CycleCommonEnum;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
+import com.xunmei.common.core.enums.edu.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.KeyValue;
 import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
@@ -41,9 +40,11 @@ import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import com.xunmei.system.api.RemoteDictDataService;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.RemoteWorkTimeService;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import com.xunmei.system.api.model.LoginUser;
 import org.springframework.beans.BeanUtils;
@@ -60,7 +61,6 @@ import java.net.URLEncoder;
 import java.time.*;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 /**
@@ -83,7 +83,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
     @Autowired
-    private RemoteOrgService remoteOrgService;
+    private RemoteRoleService roleService;
     @Autowired
     RemoteWorkTimeService workTimeService;
 
@@ -251,7 +251,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         }
         //立即生效的计划要排除截至时间在当前时间之前的数据
         List<CoreMonitoringRetrievalTask> lista = taskList.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
-        if(CollectionUtil.isNotEmpty(lista)){
+        if (CollectionUtil.isNotEmpty(lista)) {
             this.saveBatch(lista);
         }
     }
@@ -405,10 +405,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public void deleteAllTaskByPlanIds(List<Long> planId) {
         Long[] longs = planId.toArray(new Long[planId.size()]);
-     //   coreMonitoringRetrievalTaskMapper.deleteAllTaskByPlanIds(longs);
+        //   coreMonitoringRetrievalTaskMapper.deleteAllTaskByPlanIds(longs);
 
-        QueryWrapper queryWrapper=new QueryWrapper();
-        queryWrapper.in("plan_id",longs);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.in("plan_id", longs);
         coreMonitoringRetrievalTaskMapper.delete(queryWrapper);
     }
 
@@ -460,7 +460,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             sysOrg.setPath(p.getOrgPath());
             sysOrg.setType(Integer.valueOf(p.getOrgType()));
             List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);*/
-            List<SysOrg> sysOrgs = orgList.stream().filter(s -> s.getPath().contains(p.getOrgPath()) && (s.getType()!=null&&s.getType().toString().equals(p.getOrgType()))).collect(Collectors.toList());
+            List<SysOrg> sysOrgs = orgList.stream().filter(s -> s.getPath().contains(p.getOrgPath()) && (s.getType() != null && s.getType().toString().equals(p.getOrgType()))).collect(Collectors.toList());
             for (SysOrg s : sysOrgs) {
                 TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
                 BeanUtils.copyProperties(p, plan);
@@ -522,25 +522,25 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         }
         Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
         //判断作息（无周期排开）
-        if(!plan.getPlanCycle().equals(RetrievalTaskCycle.NOCYCLE.getCode().toString())){
+        if (!plan.getPlanCycle().equals(RetrievalTaskCycle.NOCYCLE.getCode().toString())) {
             boolean flag = checkWorkTime(dateRange.getStartTime(), dateRange.getEndTime(), sysOrg.getId());
-            if(flag){
+            if (flag) {
                 for (int i = 1; i <= plan.getPlanFrequency(); i++) {
                     DateRange dateRange1 = dateRanges.get(i);
                     CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, i, plan, sysOrg, dateRange1, ymd);
                     taskList.add(task);
                 }
-            }else{
-                log.error("机构"+sysOrg.getName()+"在时间"+dateRange.getStartTime()+"-"+dateRange.getEndTime()+"没有作息，不生成监控调阅任务");
+            } else {
+                log.error("机构" + sysOrg.getName() + "在时间" + dateRange.getStartTime() + "-" + dateRange.getEndTime() + "没有作息，不生成监控调阅任务");
             }
-        }else{
+        } else {
             for (int i = 1; i <= plan.getPlanFrequency(); i++) {
                 DateRange dateRange1 = dateRanges.get(i);
                 CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, i, plan, sysOrg, dateRange1, ymd);
                 taskList.add(task);
             }
         }
-         //
+        //
         return taskList;
 
     }
@@ -607,21 +607,23 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public List<CoreSafetyExceptionData> selectMonitorExceptionData(DateTime time) {
-        //逾期数据
+        //获取监控调阅的异常数据 ， 扩展字段2=overTime表示逾期数据  扩展字段2=nums表示异常通道数量数据
+       /* 逾期数据  扩展字段1：任务状态
         List<CoreSafetyExceptionData> overTimeExceptionData = baseMapper.selectMonitorOverTimeExceptionData(time);
-        //检查通道占比数量数据
-        List<CoreSafetyExceptionData> numsExceptionData = baseMapper.selectMonitorNumsExceptionData(time);
-
-        final List<CoreSafetyExceptionData> collect = Stream.of(overTimeExceptionData, numsExceptionData).flatMap(Collection::stream).collect(Collectors.toList());
-        collect.removeIf(item -> ObjectUtil.isNull(item.getDataId()));
-        return collect;
+        //检查通道占比数量数据  扩展字段1：通道数
+        List<CoreSafetyExceptionData> numsExceptionData = baseMapper.selectMonitorNumsExceptionData(time);*/
+        SysRole role = roleService.getRoleByName("网点安全员", SecurityConstants.INNER);
+        //扩展字段1：任务状态 扩展字段2 计划id
+        List<CoreSafetyExceptionData> exceptionData = baseMapper.selectMonitorExceptionData(time.year(), time.quarter(), time.month() + 1, role.getId());
+        exceptionData.removeIf(item -> ObjectUtil.isNull(item.getDataId()));
+        return exceptionData;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-   public void taskChangeForTimeWorkChange(WorkTimeChangeEvent event) {
+    public void taskChangeForTimeWorkChange(WorkTimeChangeEvent event) {
         //修改的作息的日期
-        Date ymdDate  =  event.getDataList().get(0).getYmdDate();
+        Date ymdDate = event.getDataList().get(0).getYmdDate();
 
         //受影响的机构
         List<Long> orgIds = event.getOrgIds();
@@ -638,34 +640,34 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         //要重新生成任务的机构和计划
         List<KeyValueVo> keyValues = new ArrayList<>();
 
-        Map<String,Object> dayObjectMap = null;
-        Map<String,Object> weekObjectMap=null;
-        Map<String,Object> monthObjectMap=null;
-        Map<String,Object> quarterObjectMap=null;
-        Map<String,Object> halfYearObjectMap=null;
-        Map<String,Object> yearObjectMap=null;
+        Map<String, Object> dayObjectMap = null;
+        Map<String, Object> weekObjectMap = null;
+        Map<String, Object> monthObjectMap = null;
+        Map<String, Object> quarterObjectMap = null;
+        Map<String, Object> halfYearObjectMap = null;
+        Map<String, Object> yearObjectMap = null;
         //判断ymdDate 月today是否是同一日期
-        if(DateUtil.isSameDay(ymdDate,today)){
-           //获取当天的调阅任务
-            dayObjectMap = this.deleteTaskList(ymdDate,orgIds,RetrievalTaskCycle.DAYCYCLE.getCode());
+        if (DateUtil.isSameDay(ymdDate, today)) {
+            //获取当天的调阅任务
+            dayObjectMap = this.deleteTaskList(ymdDate, orgIds, RetrievalTaskCycle.DAYCYCLE.getCode());
         }
-            weekObjectMap = this.deleteTaskList(ymdDate,orgIds,RetrievalTaskCycle.WEEKCYCLE.getCode());
-            monthObjectMap = this.deleteTaskList(ymdDate,orgIds,RetrievalTaskCycle.MONTHCYCLE.getCode());
-            quarterObjectMap = this.deleteTaskList(ymdDate,orgIds,RetrievalTaskCycle.QUARTERCYCLE.getCode());
-            halfYearObjectMap = this.deleteTaskList(ymdDate,orgIds,RetrievalTaskCycle.HALFYEARCYCLE.getCode());
-            yearObjectMap = this.deleteTaskList(ymdDate,orgIds,RetrievalTaskCycle.YEARCYCLE.getCode());
+        weekObjectMap = this.deleteTaskList(ymdDate, orgIds, RetrievalTaskCycle.WEEKCYCLE.getCode());
+        monthObjectMap = this.deleteTaskList(ymdDate, orgIds, RetrievalTaskCycle.MONTHCYCLE.getCode());
+        quarterObjectMap = this.deleteTaskList(ymdDate, orgIds, RetrievalTaskCycle.QUARTERCYCLE.getCode());
+        halfYearObjectMap = this.deleteTaskList(ymdDate, orgIds, RetrievalTaskCycle.HALFYEARCYCLE.getCode());
+        yearObjectMap = this.deleteTaskList(ymdDate, orgIds, RetrievalTaskCycle.YEARCYCLE.getCode());
 
-        Map<String,Object> allMap = this.buildDeleteTaskList(dayObjectMap,weekObjectMap,monthObjectMap,quarterObjectMap,halfYearObjectMap,yearObjectMap);
+        Map<String, Object> allMap = this.buildDeleteTaskList(dayObjectMap, weekObjectMap, monthObjectMap, quarterObjectMap, halfYearObjectMap, yearObjectMap);
         deleteTaskList = (List<CoreMonitoringRetrievalTask>) allMap.get("deleteTaskList");
         keyValues = (List<KeyValueVo>) allMap.get("keyValues");
         //删除任务
-        if(CollectionUtil.isNotEmpty(deleteTaskList)){
+        if (CollectionUtil.isNotEmpty(deleteTaskList)) {
             this.removeBatchByIds(deleteTaskList);
         }
         //生成新的任务
-       // if(CollectionUtil.isNotEmpty(keyValues)){
-           this.createNewtask(keyValues,ymdDate,orgIds);
-       // }
+        // if(CollectionUtil.isNotEmpty(keyValues)){
+        this.createNewtask(keyValues, ymdDate, orgIds);
+        // }
 
     }
 
@@ -674,10 +676,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         List<CoreMonitoringRetrievalTask> deleteTaskList = new ArrayList<>();
         List<KeyValueVo> keyValues = new ArrayList<>();
         for (Map<String, Object> objMap : ObjMaps) {
-            if(objMap != null&&objMap.containsKey("deleteTaskList")&&objMap.containsKey("keyValues")){
+            if (objMap != null && objMap.containsKey("deleteTaskList") && objMap.containsKey("keyValues")) {
                 List<CoreMonitoringRetrievalTask> listTask = (List<CoreMonitoringRetrievalTask>) objMap.get("deleteTaskList");
                 List<KeyValueVo> keyValueList = (List<KeyValueVo>) objMap.get("keyValues");
-                if(CollectionUtil.isNotEmpty(listTask)){
+                if (CollectionUtil.isNotEmpty(listTask)) {
                     deleteTaskList.addAll(listTask);
                 }
                 if (CollectionUtil.isNotEmpty(keyValueList)) {
@@ -690,13 +692,14 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         deleteTaskListMap.put("keyValues", keyValues);
         return deleteTaskListMap;
     }
-    private void createNewtask(List<KeyValueVo> keyValues,Date taskTime,List<Long> orgIds) {
+
+    private void createNewtask(List<KeyValueVo> keyValues, Date taskTime, List<Long> orgIds) {
         //获取所有机构
         List<SysOrg> orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.findAllOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-        List<SysOrg> orgs = orgList.stream().filter(r->orgIds.contains(r.getId())).collect(Collectors.toList());
+        List<SysOrg> orgs = orgList.stream().filter(r -> orgIds.contains(r.getId())).collect(Collectors.toList());
         //通过parentId获取orgList中orgs的直属上级
-        List<SysOrg> parentOrgList =  orgList.stream().filter(r->orgs.stream().anyMatch(s->s.getParentId().equals(r.getId()))).collect(Collectors.toList());
-        List<Long> orgParentIds = parentOrgList.stream().map(r->r.getId()).collect(Collectors.toList());
+        List<SysOrg> parentOrgList = orgList.stream().filter(r -> orgs.stream().anyMatch(s -> s.getParentId().equals(r.getId()))).collect(Collectors.toList());
+        List<Long> orgParentIds = parentOrgList.stream().map(r -> r.getId()).collect(Collectors.toList());
 
         //获取计划
         List<CoreMonitoringRetrievalTask> taskList = new ArrayList<>();
@@ -710,16 +713,16 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         List<TMonitoringRetrievalPlan> plans = itMonitoringRetrievalPlanService.list(queryWrapper);
         List<TMonitoringRetrievalPlan> planList = new ArrayList<>();
 
-        for(TMonitoringRetrievalPlan p:plans){
+        for (TMonitoringRetrievalPlan p : plans) {
             for (SysOrg s : orgs) {
-                if(CollectionUtil.isNotEmpty(keyValues)){
+                if (CollectionUtil.isNotEmpty(keyValues)) {
                     //机构和计划没有同时在排除的范围内的计划不生成任务
-                    if(keyValues.stream().filter(r->r.getValue().equals(p.getId())&&r.getKey().equals(s.getId())).count()>0){
+                    if (keyValues.stream().filter(r -> r.getValue().equals(p.getId()) && r.getKey().equals(s.getId())).count() > 0) {
                         continue;
                     }
                 }
                 //计划的机构id不是当前机构的直属父机构，不生成任务,计划的机构类型不是当前机构的机构类型不生成任务
-                if(!p.getOrgId().equals(s.getParentId())||(s.getType()!=null&&!s.getType().toString().equals(p.getOrgType()))){
+                if (!p.getOrgId().equals(s.getParentId()) || (s.getType() != null && !s.getType().toString().equals(p.getOrgType()))) {
                     continue;
                 }
                 TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
@@ -747,7 +750,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         }
         for (TMonitoringRetrievalPlan plan : planList) {
             //任务的开始时间按周期计算用下面的方式
-            DateRange dateRange =  DateUtils.getStartAndEnd(taskTime, Integer.valueOf(plan.getPlanCycle()));
+            DateRange dateRange = DateUtils.getStartAndEnd(taskTime, Integer.valueOf(plan.getPlanCycle()));
             Instant instant = dateRange.getStartTime().toInstant();
             // 创建 ZonedDateTime 对象，并指定时区
             ZonedDateTime zdt = instant.atZone(ZoneId.systemDefault());
@@ -759,14 +762,14 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             if (CollectionUtil.isNotEmpty(listByType)) {
                 List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, localDate, listByType.get(0));
                 if (CollectionUtil.isNotEmpty(list)) {
-                    if(!plan.getPlanCycle().equals(RetrievalTaskCycle.DAYCYCLE.getCode().toString())){
+                    if (!plan.getPlanCycle().equals(RetrievalTaskCycle.DAYCYCLE.getCode().toString())) {
                         List<CoreMonitoringRetrievalTask> lista = list.stream().filter(r -> r.getPlanEndTime().after(taskTime)).collect(Collectors.toList());
-                        if(CollectionUtil.isNotEmpty(lista)){
+                        if (CollectionUtil.isNotEmpty(lista)) {
                             taskList.addAll(lista);
                         }
-                    }else{
+                    } else {
                         List<CoreMonitoringRetrievalTask> lista = list.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
-                        if(CollectionUtil.isNotEmpty(lista)){
+                        if (CollectionUtil.isNotEmpty(lista)) {
                             taskList.addAll(lista);
                         }
                     }
@@ -777,39 +780,39 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         this.saveBatch(taskList);
     }
 
-    private Map<String,Object> deleteTaskList(Date ymdDate,List<Long> orgIds,Integer cycle){
-        Map<String,Object> objectMap = new HashMap<>();
+    private Map<String, Object> deleteTaskList(Date ymdDate, List<Long> orgIds, Integer cycle) {
+        Map<String, Object> objectMap = new HashMap<>();
         QueryWrapper<CoreMonitoringRetrievalTask> queryWrapper = new QueryWrapper<>();
-         //每日条件
+        //每日条件
         Date datetime = ymdDate;
-        if(!cycle.equals(RetrievalTaskCycle.DAYCYCLE.getCode())){
-             //根据ymdDate获取周的第一天的日期
-            DateRange dateRange =  DateUtils.getStartAndEnd(ymdDate,cycle);
+        if (!cycle.equals(RetrievalTaskCycle.DAYCYCLE.getCode())) {
+            //根据ymdDate获取周的第一天的日期
+            DateRange dateRange = DateUtils.getStartAndEnd(ymdDate, cycle);
             datetime = dateRange.getStartTime();
         }
-        LocalDate taskTime=DateUtils.toLocalDate(datetime);
+        LocalDate taskTime = DateUtils.toLocalDate(datetime);
 /*        queryWrapper.lambda().eq(CoreMonitoringRetrievalTask::getYmdDate,taskTime);
         //公共条件
         queryWrapper.lambda().in(CoreMonitoringRetrievalTask::getOrgId,orgIds);
         queryWrapper.lambda().eq(CoreMonitoringRetrievalTask::getCycle,cycle);
         List<CoreMonitoringRetrievalTask> taskList = this.list(queryWrapper);*/
-        List<CoreMonitoringRetrievalTask> taskList = baseMapper.selectTaskList(taskTime,orgIds,cycle);
+        List<CoreMonitoringRetrievalTask> taskList = baseMapper.selectTaskList(taskTime, orgIds, cycle);
         List<CoreMonitoringRetrievalTask> deleteTaskList = new ArrayList<>();
         List<KeyValueVo> keyValues = new ArrayList<>();
-        if(CollectionUtil.isNotEmpty(taskList)){
+        if (CollectionUtil.isNotEmpty(taskList)) {
             //将数据按机构分组
-            Map<Long,List<CoreMonitoringRetrievalTask>> taskMap = taskList.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getOrgId));
-            for(Long key:taskMap.keySet()){
+            Map<Long, List<CoreMonitoringRetrievalTask>> taskMap = taskList.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getOrgId));
+            for (Long key : taskMap.keySet()) {
                 List<CoreMonitoringRetrievalTask> taskList1 = taskMap.get(key);
-               //将taskList1 按batchNum进行分组
-                Map<Long,List<CoreMonitoringRetrievalTask>> taskMap1 = taskList1.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getBatchNum));
-                for(Long key1:taskMap1.keySet()){
+                //将taskList1 按batchNum进行分组
+                Map<Long, List<CoreMonitoringRetrievalTask>> taskMap1 = taskList1.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getBatchNum));
+                for (Long key1 : taskMap1.keySet()) {
                     List<CoreMonitoringRetrievalTask> taskList2 = taskMap1.get(key1);
-                    int num = (int) taskList2.stream().filter(t->t.getStatus().equals(2)).count();
+                    int num = (int) taskList2.stream().filter(t -> t.getStatus().equals(2)).count();
                     //没有完成的任务，改批次的任务删除
-                    if(num==0){
+                    if (num == 0) {
                         deleteTaskList.addAll(taskList2);
-                    }else{
+                    } else {
                         Long planId = taskList2.get(0).getPlanId();
                         KeyValueVo keyValue = new KeyValueVo();
                         keyValue.setKey(key);
@@ -819,24 +822,25 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
                 }
             }
         }
-        objectMap.put("deleteTaskList",deleteTaskList);
-        objectMap.put("keyValues",keyValues);
+        objectMap.put("deleteTaskList", deleteTaskList);
+        objectMap.put("keyValues", keyValues);
         return objectMap;
     }
 
 
-    private boolean checkWorkTime(Date workstartTime, Date workendTime,Long orgId){
-        Map<String,Object> map = new HashMap<>();
-        map.put("workstartTime",DateUtil.format(workstartTime,"yyyy-MM-dd"));
-        map.put("workendTime",DateUtil.format(workendTime,"yyyy-MM-dd"));
-        map.put("orgId",orgId);
-        Integer num = workTimeService.checkWorkTime(map,SecurityConstants.INNER);
-       if(num>0){
+    private boolean checkWorkTime(Date workstartTime, Date workendTime, Long orgId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("workstartTime", DateUtil.format(workstartTime, "yyyy-MM-dd"));
+        map.put("workendTime", DateUtil.format(workendTime, "yyyy-MM-dd"));
+        map.put("orgId", orgId);
+        Integer num = workTimeService.checkWorkTime(map, SecurityConstants.INNER);
+        if (num > 0) {
             return true;
-        }else {
-            return  false;
+        } else {
+            return false;
         }
     }
+
     private List<SysWorkTime> selectWorkTimeList(Date now, CycleCommonEnum cycle, WorkTimeChangeEvent event) {
         DateRange range = DateUtils.getStartAndEnd(now, cycle);
         String startTime = DateUtil.format(range.getStartTime(), Constants.DAILY_FORMAT);

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

@@ -0,0 +1,95 @@
+package com.xunmei.core.safetybook.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh;
+import com.xunmei.core.safetybook.service.ICoreSafetyBookAqbwbndjhService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.xunmei.common.log.annotation.Log;
+import com.xunmei.common.log.enums.BusinessType;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 安全保卫部年度计划Controller
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Api(tags = {"CoreSafetyBookAqbwbndjh"})
+@RestController
+@RequestMapping("/safetyBook/aqbwbndjh")
+public class CoreSafetyBookAqbwbndjhController extends BaseController {
+    @Autowired
+    private ICoreSafetyBookAqbwbndjhService coreSafetyBookAqbwbndjhService;
+
+    /**
+     * 查询安全保卫部年度计划列表
+     */
+    @ApiOperation(value = "查询CoreSafetyBookAqbwbndjh列表")
+    @RequiresPermissions("core:aqbwbndjh:list")
+    @PostMapping("/list")
+    public TableDataInfo<CoreSafetyBookAqbwbndjh> list(@RequestBody CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
+
+        return coreSafetyBookAqbwbndjhService.selectPage(coreSafetyBookAqbwbndjh);
+    }
+
+
+    /**
+     * 获取安全保卫部年度计划详细信息
+     */
+    @ApiOperation(value = "获取CoreSafetyBookAqbwbndjh详细信息")
+    @RequiresPermissions("core:aqbwbndjh:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(coreSafetyBookAqbwbndjhService.selectCoreSafetyBookAqbwbndjhById(id));
+    }
+
+    /**
+     * 新增安全保卫部年度计划
+     */
+    @ApiOperation(value = "新增CoreSafetyBookAqbwbndjh")
+    @RequiresPermissions("core:aqbwbndjh:add")
+    @Log(title = "安全保卫部年度计划", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
+        return toAjax(coreSafetyBookAqbwbndjhService.insertCoreSafetyBookAqbwbndjh(coreSafetyBookAqbwbndjh));
+    }
+
+    /**
+     * 修改安全保卫部年度计划
+     */
+    @ApiOperation(value = "修改CoreSafetyBookAqbwbndjh")
+    @RequiresPermissions("core:aqbwbndjh:edit")
+    @Log(title = "安全保卫部年度计划", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
+        return toAjax(coreSafetyBookAqbwbndjhService.updateCoreSafetyBookAqbwbndjh(coreSafetyBookAqbwbndjh));
+    }
+
+    /**
+     * 删除安全保卫部年度计划
+     */
+    @ApiOperation(value = "删除CoreSafetyBookAqbwbndjh")
+    @RequiresPermissions("core:aqbwbndjh:remove")
+    @Log(title = "安全保卫部年度计划", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(coreSafetyBookAqbwbndjhService.deleteCoreSafetyBookAqbwbndjhByIds(ids));
+    }
+}

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/java/com/xunmei/core/safetybook/controller/CoreSafetyBookHsggbsdjController.java

@@ -0,0 +1,95 @@
+package com.xunmei.core.safetybook.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj;
+import com.xunmei.core.safetybook.service.ICoreSafetyBookHsggbsdjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.xunmei.common.log.annotation.Log;
+import com.xunmei.common.log.enums.BusinessType;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 行社高管部署登记Controller
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Api(tags = {"CoreSafetyBookHsggbsdj"})
+@RestController
+@RequestMapping("/safetyBook/hsggbsdj")
+public class CoreSafetyBookHsggbsdjController extends BaseController {
+    @Autowired
+    private ICoreSafetyBookHsggbsdjService coreSafetyBookHsggbsdjService;
+
+    /**
+     * 查询行社高管部署登记列表
+     */
+    @ApiOperation(value = "查询CoreSafetyBookHsggbsdj列表")
+    @RequiresPermissions("core:hsggbsdj:list")
+    @PostMapping("/list")
+    public TableDataInfo<CoreSafetyBookHsggbsdj> list(@RequestBody CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
+
+        return coreSafetyBookHsggbsdjService.selectPage(coreSafetyBookHsggbsdj);
+    }
+
+
+    /**
+     * 获取行社高管部署登记详细信息
+     */
+    @ApiOperation(value = "获取CoreSafetyBookHsggbsdj详细信息")
+    @RequiresPermissions("core:hsggbsdj:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(coreSafetyBookHsggbsdjService.selectCoreSafetyBookHsggbsdjById(id));
+    }
+
+    /**
+     * 新增行社高管部署登记
+     */
+    @ApiOperation(value = "新增CoreSafetyBookHsggbsdj")
+    @RequiresPermissions("core:hsggbsdj:add")
+    @Log(title = "行社高管部署登记", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
+        return toAjax(coreSafetyBookHsggbsdjService.insertCoreSafetyBookHsggbsdj(coreSafetyBookHsggbsdj));
+    }
+
+    /**
+     * 修改行社高管部署登记
+     */
+    @ApiOperation(value = "修改CoreSafetyBookHsggbsdj")
+    @RequiresPermissions("core:hsggbsdj:edit")
+    @Log(title = "行社高管部署登记", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
+        return toAjax(coreSafetyBookHsggbsdjService.updateCoreSafetyBookHsggbsdj(coreSafetyBookHsggbsdj));
+    }
+
+    /**
+     * 删除行社高管部署登记
+     */
+    @ApiOperation(value = "删除CoreSafetyBookHsggbsdj")
+    @RequiresPermissions("core:hsggbsdj:remove")
+    @Log(title = "行社高管部署登记", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(coreSafetyBookHsggbsdjService.deleteCoreSafetyBookHsggbsdjByIds(ids));
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookAqbwbndjh.java

@@ -0,0 +1,112 @@
+package com.xunmei.core.safetybook.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.xunmei.common.core.web.domain.BaseEntity;
+
+/**
+ * 安全保卫部年度计划对象 core_safety_book_aqbwbndjh
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_safety_book_aqbwbndjh")
+@ApiModel(value = "CoreSafetyBookAqbwbndjh对象", description = "安全保卫部年度计划")
+public class CoreSafetyBookAqbwbndjh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 工作主题
+     */
+    @ApiModelProperty(value = "工作主题")
+    private String title;
+    @TableField(exist = false)
+    private String orgName;
+    @TableField(exist = false)
+    private String userName;
+    /**
+     * 开会日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "记录日期")
+    private Date date;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 照片
+     */
+    @ApiModelProperty(value = "照片")
+    private String images;
+
+    /**
+     * 机构id
+     */
+    @ApiModelProperty(value = "机构id")
+    private Long orgId;
+    @TableField(exist = false)
+    private String userNames;
+    @TableField(exist = false)
+    private List<Long> userIds;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id", getId())
+
+
+                .append("title", getTitle())
+
+
+                .append("date", getDate())
+
+
+                .append("content", getContent())
+
+
+                .append("createTime", getCreateTime())
+
+
+                .append("updateTime", getUpdateTime())
+
+
+                .append("createBy", getCreateBy())
+
+
+                .append("updateBy", getUpdateBy())
+
+
+                .append("images", getImages())
+
+
+                .append("orgId", getOrgId())
+                .toString();
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookAqbwbndjhUser.java

@@ -0,0 +1,80 @@
+package com.xunmei.core.safetybook.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.xunmei.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 core_safety_book_aqbwbndjh_user
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_safety_book_aqbwbndjh_user")
+@ApiModel(value = "CoreSafetyBookAqbwbndjhUser对象", description = "【请填写功能名称】")
+public class CoreSafetyBookAqbwbndjhUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 安全保卫部年度计划id
+     */
+    @ApiModelProperty(value = "安全保卫部年度计划id")
+    private Long aqbwbndjhId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    public CoreSafetyBookAqbwbndjhUser() {
+    }
+
+    public CoreSafetyBookAqbwbndjhUser(Long aqbwbndjhId, Long userId) {
+        this.aqbwbndjhId = aqbwbndjhId;
+        this.userId = userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id", getId())
+
+
+                .append("aqbwbndjhId", getAqbwbndjhId())
+
+
+                .append("userId", getUserId())
+
+
+                .append("createTime", getCreateTime())
+
+
+                .append("updateTime", getUpdateTime())
+
+
+                .append("createBy", getCreateBy())
+
+
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookHsggbsdj.java

@@ -0,0 +1,99 @@
+package com.xunmei.core.safetybook.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.xunmei.common.core.web.domain.BaseEntity;
+
+/**
+ * 行社高管部署登记对象 core_safety_book_hsggbsdj
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_safety_book_hsggbsdj")
+@ApiModel(value = "CoreSafetyBookHsggbsdj对象", description = "行社高管部署登记")
+public class CoreSafetyBookHsggbsdj extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 工作主题
+     */
+    @ApiModelProperty(value = "工作主题")
+    private String title;
+
+    /**
+     * 开会日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开会日期")
+    private Date date;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 照片
+     */
+    @ApiModelProperty(value = "照片")
+    private String images;
+    @TableField(exist = false)
+    private String userNames;
+    @TableField(exist = false)
+    private List<Long> userIds;
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id", getId())
+
+
+                .append("title", getTitle())
+
+
+                .append("date", getDate())
+
+
+                .append("content", getContent())
+
+
+                .append("createTime", getCreateTime())
+
+
+                .append("updateTime", getUpdateTime())
+
+
+                .append("createBy", getCreateBy())
+
+
+                .append("updateBy", getUpdateBy())
+
+
+                .append("images", getImages())
+                .toString();
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookHsggbsdjUser.java

@@ -0,0 +1,81 @@
+package com.xunmei.core.safetybook.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.xunmei.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 core_safety_book_hsggbsdj_user
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_safety_book_hsggbsdj_user")
+@ApiModel(value = "CoreSafetyBookHsggbsdjUser对象", description = "【请填写功能名称】")
+public class CoreSafetyBookHsggbsdjUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    public CoreSafetyBookHsggbsdjUser(Long hsggbsdjId, Long userId) {
+        this.hsggbsdjId = hsggbsdjId;
+        this.userId = userId;
+    }
+
+    public CoreSafetyBookHsggbsdjUser() {
+    }
+
+    /**
+     * 行社高管部署登记id
+     */
+    @ApiModelProperty(value = "行社高管部署登记id")
+    private Long hsggbsdjId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id", getId())
+
+
+                .append("hsggbsdjId", getHsggbsdjId())
+
+
+                .append("userId", getUserId())
+
+
+                .append("createTime", getCreateTime())
+
+
+                .append("updateTime", getUpdateTime())
+
+
+                .append("createBy", getCreateBy())
+
+
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/mapper/CoreSafetyBookAqbwbndjhMapper.java

@@ -0,0 +1,68 @@
+package com.xunmei.core.safetybook.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 安全保卫部年度计划Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface CoreSafetyBookAqbwbndjhMapper extends BaseMapper<CoreSafetyBookAqbwbndjh> {
+    /**
+     * 查询安全保卫部年度计划
+     *
+     * @param id 安全保卫部年度计划主键
+     * @return 安全保卫部年度计划
+     */
+    CoreSafetyBookAqbwbndjh selectCoreSafetyBookAqbwbndjhById(Long id);
+
+    /**
+     * 查询安全保卫部年度计划列表
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 安全保卫部年度计划集合
+     */
+    List<CoreSafetyBookAqbwbndjh> selectCoreSafetyBookAqbwbndjhList(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+
+    /**
+     * 新增安全保卫部年度计划
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 结果
+     */
+    int insertCoreSafetyBookAqbwbndjh(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+
+    /**
+     * 修改安全保卫部年度计划
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 结果
+     */
+    int updateCoreSafetyBookAqbwbndjh(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+
+    /**
+     * 删除安全保卫部年度计划
+     *
+     * @param id 安全保卫部年度计划主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhById(Long id);
+
+    /**
+     * 批量删除安全保卫部年度计划
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhByIds(Long[] ids);
+
+    Page<CoreSafetyBookAqbwbndjh> selectAqbwbndjhPage(Page<CoreSafetyBookAqbwbndjh> page, @Param("aq") CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+
+    CoreSafetyBookAqbwbndjh selectAqbwbndjhById(Long id);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/mapper/CoreSafetyBookAqbwbndjhUserMapper.java

@@ -0,0 +1,62 @@
+package com.xunmei.core.safetybook.mapper;
+
+import java.util.List;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface CoreSafetyBookAqbwbndjhUserMapper extends BaseMapper<CoreSafetyBookAqbwbndjhUser> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreSafetyBookAqbwbndjhUser selectCoreSafetyBookAqbwbndjhUserById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreSafetyBookAqbwbndjhUser> selectCoreSafetyBookAqbwbndjhUserList(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreSafetyBookAqbwbndjhUser(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreSafetyBookAqbwbndjhUser(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhUserById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhUserByIds(Long[] ids);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/mapper/CoreSafetyBookHsggbsdjMapper.java

@@ -0,0 +1,68 @@
+package com.xunmei.core.safetybook.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 行社高管部署登记Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface CoreSafetyBookHsggbsdjMapper extends BaseMapper<CoreSafetyBookHsggbsdj> {
+    /**
+     * 查询行社高管部署登记
+     *
+     * @param id 行社高管部署登记主键
+     * @return 行社高管部署登记
+     */
+    CoreSafetyBookHsggbsdj selectCoreSafetyBookHsggbsdjById(Long id);
+
+    /**
+     * 查询行社高管部署登记列表
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 行社高管部署登记集合
+     */
+    List<CoreSafetyBookHsggbsdj> selectCoreSafetyBookHsggbsdjList(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+
+    /**
+     * 新增行社高管部署登记
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 结果
+     */
+    int insertCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+
+    /**
+     * 修改行社高管部署登记
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 结果
+     */
+    int updateCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+
+    /**
+     * 删除行社高管部署登记
+     *
+     * @param id 行社高管部署登记主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjById(Long id);
+
+    /**
+     * 批量删除行社高管部署登记
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjByIds(Long[] ids);
+
+    Page<CoreSafetyBookHsggbsdj> selectHsggbsdjPage(Page<CoreSafetyBookHsggbsdj> page, @Param("hs") CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+
+    CoreSafetyBookHsggbsdj selectHsggbsdjById(Long id);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/mapper/CoreSafetyBookHsggbsdjUserMapper.java

@@ -0,0 +1,62 @@
+package com.xunmei.core.safetybook.mapper;
+
+import java.util.List;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface CoreSafetyBookHsggbsdjUserMapper extends BaseMapper<CoreSafetyBookHsggbsdjUser> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreSafetyBookHsggbsdjUser selectCoreSafetyBookHsggbsdjUserById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreSafetyBookHsggbsdjUser> selectCoreSafetyBookHsggbsdjUserList(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreSafetyBookHsggbsdjUser(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreSafetyBookHsggbsdjUser(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjUserById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjUserByIds(Long[] ids);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/ICoreSafetyBookAqbwbndjhService.java

@@ -0,0 +1,72 @@
+package com.xunmei.core.safetybook.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh;
+
+/**
+ * 安全保卫部年度计划Service接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface ICoreSafetyBookAqbwbndjhService extends IService<CoreSafetyBookAqbwbndjh> {
+    /**
+     * 查询安全保卫部年度计划
+     *
+     * @param id 安全保卫部年度计划主键
+     * @return 安全保卫部年度计划
+     */
+    CoreSafetyBookAqbwbndjh selectCoreSafetyBookAqbwbndjhById(Long id);
+
+    /**
+     * 查询安全保卫部年度计划列表
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 安全保卫部年度计划集合
+     */
+    List<CoreSafetyBookAqbwbndjh> selectCoreSafetyBookAqbwbndjhList(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+
+    /**
+     * 新增安全保卫部年度计划
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 结果
+     */
+    int insertCoreSafetyBookAqbwbndjh(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+
+    /**
+     * 修改安全保卫部年度计划
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 结果
+     */
+    int updateCoreSafetyBookAqbwbndjh(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+
+    /**
+     * 批量删除安全保卫部年度计划
+     *
+     * @param ids 需要删除的安全保卫部年度计划主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhByIds(Long[] ids);
+
+    /**
+     * 删除安全保卫部年度计划信息
+     *
+     * @param id 安全保卫部年度计划主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhById(Long id);
+
+    /**
+     * 查询安全保卫部年度计划分页数据
+     *
+     * @param coreSafetyBookAqbwbndjh 查询条件对象
+     * @return Page
+     */
+    TableDataInfo<CoreSafetyBookAqbwbndjh> selectPage(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/ICoreSafetyBookAqbwbndjhUserService.java

@@ -0,0 +1,72 @@
+package com.xunmei.core.safetybook.service;
+
+import java.util.List;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface ICoreSafetyBookAqbwbndjhUserService extends IService<CoreSafetyBookAqbwbndjhUser> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreSafetyBookAqbwbndjhUser selectCoreSafetyBookAqbwbndjhUserById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreSafetyBookAqbwbndjhUser> selectCoreSafetyBookAqbwbndjhUserList(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreSafetyBookAqbwbndjhUser(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreSafetyBookAqbwbndjhUser(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhUserByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookAqbwbndjhUserById(Long id);
+
+    /**
+     * 查询【请填写功能名称】分页数据
+     *
+     * @param coreSafetyBookAqbwbndjhUser 查询条件对象
+     * @return Page
+     */
+    TableDataInfo<CoreSafetyBookAqbwbndjhUser> selectPage(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/ICoreSafetyBookHsggbsdjService.java

@@ -0,0 +1,72 @@
+package com.xunmei.core.safetybook.service;
+
+import java.util.List;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 行社高管部署登记Service接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface ICoreSafetyBookHsggbsdjService extends IService<CoreSafetyBookHsggbsdj> {
+    /**
+     * 查询行社高管部署登记
+     *
+     * @param id 行社高管部署登记主键
+     * @return 行社高管部署登记
+     */
+    CoreSafetyBookHsggbsdj selectCoreSafetyBookHsggbsdjById(Long id);
+
+    /**
+     * 查询行社高管部署登记列表
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 行社高管部署登记集合
+     */
+    List<CoreSafetyBookHsggbsdj> selectCoreSafetyBookHsggbsdjList(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+
+    /**
+     * 新增行社高管部署登记
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 结果
+     */
+    int insertCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+
+    /**
+     * 修改行社高管部署登记
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 结果
+     */
+    int updateCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+
+    /**
+     * 批量删除行社高管部署登记
+     *
+     * @param ids 需要删除的行社高管部署登记主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjByIds(Long[] ids);
+
+    /**
+     * 删除行社高管部署登记信息
+     *
+     * @param id 行社高管部署登记主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjById(Long id);
+
+    /**
+     * 查询行社高管部署登记分页数据
+     *
+     * @param coreSafetyBookHsggbsdj 查询条件对象
+     * @return Page
+     */
+    TableDataInfo<CoreSafetyBookHsggbsdj> selectPage(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/ICoreSafetyBookHsggbsdjUserService.java

@@ -0,0 +1,72 @@
+package com.xunmei.core.safetybook.service;
+
+import java.util.List;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+public interface ICoreSafetyBookHsggbsdjUserService extends IService<CoreSafetyBookHsggbsdjUser> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreSafetyBookHsggbsdjUser selectCoreSafetyBookHsggbsdjUserById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreSafetyBookHsggbsdjUser> selectCoreSafetyBookHsggbsdjUserList(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreSafetyBookHsggbsdjUser(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreSafetyBookHsggbsdjUser(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjUserByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookHsggbsdjUserById(Long id);
+
+    /**
+     * 查询【请填写功能名称】分页数据
+     *
+     * @param coreSafetyBookHsggbsdjUser 查询条件对象
+     * @return Page
+     */
+    TableDataInfo<CoreSafetyBookHsggbsdjUser> selectPage(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookAqbwbndjhServiceImpl.java

@@ -0,0 +1,148 @@
+package com.xunmei.core.safetybook.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhMapper;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhUserMapper;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper;
+import com.xunmei.core.safetybook.service.ICoreSafetyBookAqbwbndjhService;
+import com.xunmei.system.api.RemoteOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 安全保卫部年度计划Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Service
+public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBookAqbwbndjhMapper, CoreSafetyBookAqbwbndjh> implements ICoreSafetyBookAqbwbndjhService {
+    @Autowired
+    private CoreSafetyBookAqbwbndjhMapper coreSafetyBookAqbwbndjhMapper;
+    @Autowired
+    private RemoteOrgService orgService;
+    @Autowired
+    private CoreSafetyBookAqbwbndjhUserMapper coreSafetyBookAqbwbndjhUserMapper;
+    @Override
+    public TableDataInfo<CoreSafetyBookAqbwbndjh> selectPage(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
+        //未删除
+        Page<CoreSafetyBookAqbwbndjh> page;
+        //分页
+        if (coreSafetyBookAqbwbndjh.getPageNum() != null && coreSafetyBookAqbwbndjh.getPageSize() != null) {
+            page = new Page<>(coreSafetyBookAqbwbndjh.getPageNum(), coreSafetyBookAqbwbndjh.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+
+        //获取数据
+        page = coreSafetyBookAqbwbndjhMapper.selectAqbwbndjhPage(page, coreSafetyBookAqbwbndjh);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+
+
+    }
+
+
+    /**
+     * 查询安全保卫部年度计划
+     *
+     * @param id 安全保卫部年度计划主键
+     * @return 安全保卫部年度计划
+     */
+    @Override
+    public CoreSafetyBookAqbwbndjh selectCoreSafetyBookAqbwbndjhById(Long id) {
+        CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh = coreSafetyBookAqbwbndjhMapper.selectAqbwbndjhById(id);
+        List<CoreSafetyBookAqbwbndjhUser> coreSafetyBookAqbwbndjhUsers = coreSafetyBookAqbwbndjhUserMapper.selectList(new LambdaQueryWrapper<CoreSafetyBookAqbwbndjhUser>().eq(CoreSafetyBookAqbwbndjhUser::getAqbwbndjhId, id));
+        if(coreSafetyBookAqbwbndjhUsers!=null&&coreSafetyBookAqbwbndjhUsers.size()>0) {
+            coreSafetyBookAqbwbndjh.setUserIds(coreSafetyBookAqbwbndjhUsers.stream().map(CoreSafetyBookAqbwbndjhUser::getUserId).collect(Collectors.toList()));
+        }
+        return coreSafetyBookAqbwbndjh;
+    }
+
+    /**
+     * 查询安全保卫部年度计划列表
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 安全保卫部年度计划
+     */
+    @Override
+    public List<CoreSafetyBookAqbwbndjh> selectCoreSafetyBookAqbwbndjhList(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
+        return coreSafetyBookAqbwbndjhMapper.selectList(new QueryWrapper<>(coreSafetyBookAqbwbndjh));
+    }
+
+    /**
+     * 新增安全保卫部年度计划
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 结果
+     */
+    @Override
+    public int insertCoreSafetyBookAqbwbndjh(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
+        coreSafetyBookAqbwbndjh.setCreateTime(DateUtils.getNowDate());
+        coreSafetyBookAqbwbndjh.setCreateBy(SecurityUtils.getUserId().toString());
+        coreSafetyBookAqbwbndjhMapper.insert(coreSafetyBookAqbwbndjh);
+        for (Long id :
+                coreSafetyBookAqbwbndjh.getUserIds()) {
+            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
+        }
+        return 1;
+    }
+
+    /**
+     * 修改安全保卫部年度计划
+     *
+     * @param coreSafetyBookAqbwbndjh 安全保卫部年度计划
+     * @return 结果
+     */
+    @Override
+    public int updateCoreSafetyBookAqbwbndjh(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
+        coreSafetyBookAqbwbndjh.setUpdateTime(DateUtils.getNowDate());
+        coreSafetyBookAqbwbndjh.setUpdateBy(SecurityUtils.getUserId().toString());
+        coreSafetyBookAqbwbndjhUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookAqbwbndjhUser>().eq(CoreSafetyBookAqbwbndjhUser::getAqbwbndjhId, coreSafetyBookAqbwbndjh.getId()));
+        for (Long id :
+                coreSafetyBookAqbwbndjh.getUserIds()) {
+            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
+        }
+        return coreSafetyBookAqbwbndjhMapper.updateById(coreSafetyBookAqbwbndjh);
+    }
+
+    /**
+     * 批量删除安全保卫部年度计划
+     *
+     * @param ids 需要删除的安全保卫部年度计划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookAqbwbndjhByIds(Long[] ids) {
+        coreSafetyBookAqbwbndjhUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookAqbwbndjhUser>().in(CoreSafetyBookAqbwbndjhUser::getAqbwbndjhId, Arrays.asList(ids)));
+
+        return coreSafetyBookAqbwbndjhMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除安全保卫部年度计划信息
+     *
+     * @param id 安全保卫部年度计划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookAqbwbndjhById(Long id) {
+        return coreSafetyBookAqbwbndjhMapper.deleteById(id);
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookAqbwbndjhUserServiceImpl.java

@@ -0,0 +1,128 @@
+package com.xunmei.core.safetybook.service.impl;
+
+import java.util.List;
+
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhUserMapper;
+import com.xunmei.core.safetybook.service.ICoreSafetyBookAqbwbndjhUserService;
+import com.xunmei.system.api.RemoteOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Service
+public class CoreSafetyBookAqbwbndjhUserServiceImpl extends ServiceImpl<CoreSafetyBookAqbwbndjhUserMapper, CoreSafetyBookAqbwbndjhUser> implements ICoreSafetyBookAqbwbndjhUserService {
+    @Autowired
+    private CoreSafetyBookAqbwbndjhUserMapper coreSafetyBookAqbwbndjhUserMapper;
+    @Autowired
+    private RemoteOrgService orgService;
+
+    @Override
+    public TableDataInfo<CoreSafetyBookAqbwbndjhUser> selectPage(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser) {
+        //未删除
+        Page<CoreSafetyBookAqbwbndjhUser> page;
+        //分页
+        if (coreSafetyBookAqbwbndjhUser.getPageNum() != null && coreSafetyBookAqbwbndjhUser.getPageSize() != null) {
+            page = new Page<>(coreSafetyBookAqbwbndjhUser.getPageNum(), coreSafetyBookAqbwbndjhUser.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        //查询条件
+        QueryWrapper<CoreSafetyBookAqbwbndjhUser> query = new QueryWrapper<>(coreSafetyBookAqbwbndjhUser);
+        //下穿
+        if (coreSafetyBookAqbwbndjhUser.getCheckSub()) {
+        }
+        //时间范围查询
+        if (coreSafetyBookAqbwbndjhUser.getParams().get("beginTime") != null && coreSafetyBookAqbwbndjhUser.getParams().get("endTime") != null) {
+            query.between("create_time", coreSafetyBookAqbwbndjhUser.getParams().get("beginTime"), coreSafetyBookAqbwbndjhUser.getParams().get("endTime"));
+        }
+        //获取数据
+        page = coreSafetyBookAqbwbndjhUserMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+
+
+    }
+
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public CoreSafetyBookAqbwbndjhUser selectCoreSafetyBookAqbwbndjhUserById(Long id) {
+        return coreSafetyBookAqbwbndjhUserMapper.selectById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<CoreSafetyBookAqbwbndjhUser> selectCoreSafetyBookAqbwbndjhUserList(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser) {
+        return coreSafetyBookAqbwbndjhUserMapper.selectList(new QueryWrapper<>(coreSafetyBookAqbwbndjhUser));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertCoreSafetyBookAqbwbndjhUser(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser) {
+        coreSafetyBookAqbwbndjhUser.setCreateTime(DateUtils.getNowDate());
+        return coreSafetyBookAqbwbndjhUserMapper.insert(coreSafetyBookAqbwbndjhUser);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookAqbwbndjhUser 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateCoreSafetyBookAqbwbndjhUser(CoreSafetyBookAqbwbndjhUser coreSafetyBookAqbwbndjhUser) {
+        coreSafetyBookAqbwbndjhUser.setUpdateTime(DateUtils.getNowDate());
+        return coreSafetyBookAqbwbndjhUserMapper.updateById(coreSafetyBookAqbwbndjhUser);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookAqbwbndjhUserByIds(Long[] ids) {
+        return coreSafetyBookAqbwbndjhUserMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookAqbwbndjhUserById(Long id) {
+        return coreSafetyBookAqbwbndjhUserMapper.deleteById(id);
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookHsggbsdjServiceImpl.java

@@ -0,0 +1,144 @@
+package com.xunmei.core.safetybook.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjMapper;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper;
+import com.xunmei.core.safetybook.service.ICoreSafetyBookHsggbsdjService;
+import com.xunmei.system.api.RemoteOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 行社高管部署登记Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Service
+public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBookHsggbsdjMapper, CoreSafetyBookHsggbsdj> implements ICoreSafetyBookHsggbsdjService {
+    @Autowired
+    private CoreSafetyBookHsggbsdjMapper coreSafetyBookHsggbsdjMapper;
+    @Autowired
+    private RemoteOrgService orgService;
+    @Autowired
+    private CoreSafetyBookHsggbsdjUserMapper coreSafetyBookHsggbsdjUserMapper;
+
+    @Override
+    public TableDataInfo<CoreSafetyBookHsggbsdj> selectPage(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
+        //未删除
+        Page<CoreSafetyBookHsggbsdj> page;
+        //分页
+        if (coreSafetyBookHsggbsdj.getPageNum() != null && coreSafetyBookHsggbsdj.getPageSize() != null) {
+            page = new Page<>(coreSafetyBookHsggbsdj.getPageNum(), coreSafetyBookHsggbsdj.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        //获取数据
+        page = coreSafetyBookHsggbsdjMapper.selectHsggbsdjPage(page, coreSafetyBookHsggbsdj);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+
+
+    }
+
+
+    /**
+     * 查询行社高管部署登记
+     *
+     * @param id 行社高管部署登记主键
+     * @return 行社高管部署登记
+     */
+    @Override
+    public CoreSafetyBookHsggbsdj selectCoreSafetyBookHsggbsdjById(Long id) {
+        CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj = coreSafetyBookHsggbsdjMapper.selectHsggbsdjById(id);
+        List<CoreSafetyBookHsggbsdjUser> coreSafetyBookHsggbsdjUsers = coreSafetyBookHsggbsdjUserMapper.selectList(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, id));
+        if(coreSafetyBookHsggbsdjUsers!=null&&coreSafetyBookHsggbsdjUsers.size()>0) {
+            coreSafetyBookHsggbsdj.setUserIds(coreSafetyBookHsggbsdjUsers.stream().map(CoreSafetyBookHsggbsdjUser::getUserId).collect(Collectors.toList()));
+        }
+        return coreSafetyBookHsggbsdj;
+    }
+
+    /**
+     * 查询行社高管部署登记列表
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 行社高管部署登记
+     */
+    @Override
+    public List<CoreSafetyBookHsggbsdj> selectCoreSafetyBookHsggbsdjList(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
+        return coreSafetyBookHsggbsdjMapper.selectList(new QueryWrapper<>(coreSafetyBookHsggbsdj));
+    }
+
+    /**
+     * 新增行社高管部署登记
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 结果
+     */
+    @Override
+    public int insertCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
+        coreSafetyBookHsggbsdj.setCreateTime(DateUtils.getNowDate());
+        coreSafetyBookHsggbsdj.setCreateBy(SecurityUtils.getUserId().toString());
+        coreSafetyBookHsggbsdjMapper.insert(coreSafetyBookHsggbsdj);
+        for (Long id :
+                coreSafetyBookHsggbsdj.getUserIds()) {
+            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
+        }
+        return 1;
+    }
+
+    /**
+     * 修改行社高管部署登记
+     *
+     * @param coreSafetyBookHsggbsdj 行社高管部署登记
+     * @return 结果
+     */
+    @Override
+    public int updateCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
+        coreSafetyBookHsggbsdj.setUpdateTime(DateUtils.getNowDate());
+        coreSafetyBookHsggbsdj.setUpdateBy(SecurityUtils.getUserId().toString());
+        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, coreSafetyBookHsggbsdj.getId()));
+        for (Long id :
+                coreSafetyBookHsggbsdj.getUserIds()) {
+            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
+        }
+        return coreSafetyBookHsggbsdjMapper.updateById(coreSafetyBookHsggbsdj);
+    }
+
+    /**
+     * 批量删除行社高管部署登记
+     *
+     * @param ids 需要删除的行社高管部署登记主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookHsggbsdjByIds(Long[] ids) {
+        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().in(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, Arrays.asList(ids)));
+        return coreSafetyBookHsggbsdjMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除行社高管部署登记信息
+     *
+     * @param id 行社高管部署登记主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookHsggbsdjById(Long id) {
+        return coreSafetyBookHsggbsdjMapper.deleteById(id);
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookHsggbsdjUserServiceImpl.java

@@ -0,0 +1,125 @@
+package com.xunmei.core.safetybook.service.impl;
+
+import java.util.List;
+
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper;
+import com.xunmei.core.safetybook.service.ICoreSafetyBookHsggbsdjUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-10-26
+ */
+@Service
+public class CoreSafetyBookHsggbsdjUserServiceImpl extends ServiceImpl<CoreSafetyBookHsggbsdjUserMapper, CoreSafetyBookHsggbsdjUser> implements ICoreSafetyBookHsggbsdjUserService {
+    @Autowired
+    private CoreSafetyBookHsggbsdjUserMapper coreSafetyBookHsggbsdjUserMapper;
+
+    @Override
+    public TableDataInfo<CoreSafetyBookHsggbsdjUser> selectPage(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser) {
+        //未删除
+        Page<CoreSafetyBookHsggbsdjUser> page;
+        //分页
+        if (coreSafetyBookHsggbsdjUser.getPageNum() != null && coreSafetyBookHsggbsdjUser.getPageSize() != null) {
+            page = new Page<>(coreSafetyBookHsggbsdjUser.getPageNum(), coreSafetyBookHsggbsdjUser.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        //查询条件
+        QueryWrapper<CoreSafetyBookHsggbsdjUser> query = new QueryWrapper<>(coreSafetyBookHsggbsdjUser);
+        //下穿
+        if (coreSafetyBookHsggbsdjUser.getCheckSub()) {
+        }
+        //时间范围查询
+        if (coreSafetyBookHsggbsdjUser.getParams().get("beginTime") != null && coreSafetyBookHsggbsdjUser.getParams().get("endTime") != null) {
+            query.between("create_time", coreSafetyBookHsggbsdjUser.getParams().get("beginTime"), coreSafetyBookHsggbsdjUser.getParams().get("endTime"));
+        }
+        //获取数据
+        page = coreSafetyBookHsggbsdjUserMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+
+
+    }
+
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public CoreSafetyBookHsggbsdjUser selectCoreSafetyBookHsggbsdjUserById(Long id) {
+        return coreSafetyBookHsggbsdjUserMapper.selectById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<CoreSafetyBookHsggbsdjUser> selectCoreSafetyBookHsggbsdjUserList(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser) {
+        return coreSafetyBookHsggbsdjUserMapper.selectList(new QueryWrapper<>(coreSafetyBookHsggbsdjUser));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertCoreSafetyBookHsggbsdjUser(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser) {
+        coreSafetyBookHsggbsdjUser.setCreateTime(DateUtils.getNowDate());
+        return coreSafetyBookHsggbsdjUserMapper.insert(coreSafetyBookHsggbsdjUser);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookHsggbsdjUser 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateCoreSafetyBookHsggbsdjUser(CoreSafetyBookHsggbsdjUser coreSafetyBookHsggbsdjUser) {
+        coreSafetyBookHsggbsdjUser.setUpdateTime(DateUtils.getNowDate());
+        return coreSafetyBookHsggbsdjUserMapper.updateById(coreSafetyBookHsggbsdjUser);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookHsggbsdjUserByIds(Long[] ids) {
+        return coreSafetyBookHsggbsdjUserMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookHsggbsdjUserById(Long id) {
+        return coreSafetyBookHsggbsdjUserMapper.deleteById(id);
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyExceptionDataServiceImpl.java

@@ -5,18 +5,14 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.Constants;
-import com.xunmei.common.core.domain.safetyindex.domain.CoreSafeMonthScore;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyDeductData;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetySourceData;
 import com.xunmei.common.core.domain.safetyindex.vo.SafeIndexRuleCountVo;
-import com.xunmei.common.core.enums.OrgTypeEnum;
-import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.core.question.service.IQuestionService;
 import com.xunmei.core.resumption.service.ResumptionService;
@@ -43,19 +39,22 @@ import java.util.stream.Collectors;
  */
 @Service
 public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyExceptionDataMapper, CoreSafetyExceptionData> implements ICoreSafetyExceptionDataService {
-    public static final String RESUMPTION_DICT_CODE = "1004";
-    public static final String QUESTION_DICT_CODE = "1005";
-    public static final String MONITORING_DICT_CODE = "1006";
     public static final String CORE_RESUMPTION = "core_resumption";
     public static final String CORE_QUESTION = "core_question";
     public static final String CORE_MONITORING_RETRIEVAL_TASK = "core_monitoring_retrieval_task";
-    public static final String BEFORE_POINT_CODE = "10040201";
-    public static final String MIDDLE_POINT_CODE = "10040203";
-    public static final String AFTER_POINT_CODE = "10040202";
-    public static final String UN_CONFIRM_POINT_CODE = "10050101";
-    public static final String UN_RECTIFY_POINT_CODE = "10050101";
-    public static final String MONITORING_EXCEPTION_NUMS_POINT_CODE = "10060101";
-    public static final String MONITORING_OVERDUE_POINT_CODE = "10060201";
+
+    public static final String RESUMPTION_DICT_CODE = "1004";//安保履职
+    public static final String BEFORE_POINT_CODE = "10040201";//未登网点安全员（营业前）
+    public static final String MIDDLE_POINT_CODE = "10040203";//未登网点安全员（营业后）
+    public static final String AFTER_POINT_CODE = "10040202";//未登网点安全员（营业中）
+
+
+    public static final String QUESTION_DICT_CODE = "1005";//问题整改
+    public static final String UN_CONFIRM_POINT_CODE = "10050101";//未在规定时间内确认
+    public static final String UN_RECTIFY_POINT_CODE = "10050201";//已确认但未在规定时间内完成整改
+
+    public static final String MONITORING_DICT_CODE = "1006";//监控调阅
+    public static final String MONITORING_EXCEPTION_NUMS_POINT_CODE = "10060101";//未登-网点安全员(每周)
     @Autowired
     private CoreSafetyExceptionDataMapper coreSafetyExceptionDataMapper;
     @Autowired
@@ -72,6 +71,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     private ICoreSafetySourceDataService sourceDataService;
     @Autowired
     private ICoreSafeMonthScoreService safeMonthScoreService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void countExceptionData(String date) {
@@ -125,7 +125,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         calculateMonitoringData(monitoringIndexList, monitoringExceptionDataList, year, month, orgList);
 
 
-        calculateAll(year,month);
+        calculateAll(year, month);
     }
 
     private void calculateAll(int year, int month) {
@@ -182,22 +182,87 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
                 if (orgMonitoringIndexList.isEmpty()) {
                     return;
                 }
-                //逾期的规则
-                List<SafeIndexRuleCountVo> overdueIndexList = orgMonitoringIndexList.stream()
-                        .filter(r -> ObjectUtil.equal(MONITORING_OVERDUE_POINT_CODE, r.getPointCode()))
-                        .filter(r -> r.getCalculateType().equals(Constants.ONE))
-                        .collect(Collectors.toList());
-                //获取机构的异常数据并计算逾期分数
-                List<CoreSafetyExceptionData> monitoringExceptionDataListByOrg = monitoringExceptionDataList.get(orgId);
-                if (ObjectUtil.isNotEmpty(monitoringIndexList)) {
-                    List<CoreSafetySourceData> sourceDataList = calculateContinuousCumulativeCount(overdueIndexList, monitoringExceptionDataListByOrg, orgId, year, month);
-                    saveSourceData(sourceDataList, monitoringIndexList.get(0));
-                }
+                calculateMonitorContinuousCumulativeCount(orgMonitoringIndexList, monitoringExceptionDataList.get(orgId), orgId, year, month);
+
             });
         }
 
     }
 
+    private void calculateMonitorContinuousCumulativeCount(List<SafeIndexRuleCountVo> orgMonitoringIndexList, List<CoreSafetyExceptionData> dataList, Long orgId, int year, int month) {
+        List<CoreSafetyExceptionData> errorDataList = dataList.stream().filter(data -> ObjectUtil.equal(3, data.getExtraField1())).collect(Collectors.toList());
+        int count = errorDataList.size();
+        if (count == 0) {
+            return;
+        }
+
+        List<CoreSafetySourceData> sourceDataList = new ArrayList<>();
+        //获取累计数
+        orgMonitoringIndexList.stream()
+                .filter(r -> r.getCalculateType().equals(Constants.ONE))
+                .findFirst()
+                .ifPresent(config -> {
+                    double deductScore = count * config.getItemValue();
+                    //计算累计数
+                    CoreSafetySourceData safeSourceData = doNewSafetySourceData(config, orgId, deductScore, year, month, count);
+                    sourceDataList.add(safeSourceData);
+                });
+
+        //获取连续数的配置，并根据配置的连续数日期进行倒序
+        List<SafeIndexRuleCountVo> monitoringContinuousNums = orgMonitoringIndexList.stream()
+                .filter(r -> r.getCalculateType().equals(Constants.TWO))
+                .sorted(Comparator.comparing(SafeIndexRuleCountVo::getIndicatorDays).reversed())
+                .collect(Collectors.toList());
+        //所有逾期的数据
+        List<CoreSafetyExceptionData> overDueDataList = dataList.stream().filter(data -> ObjectUtil.equal(data.getExtraField1(), 3)).collect(Collectors.toList());
+        List<SafeIndexRuleCountVo> usedConfigList = new ArrayList<>();
+        //循环配置的连续数
+        for (SafeIndexRuleCountVo monitoringContinuousNum : monitoringContinuousNums) {
+            if (usedConfigList.contains(monitoringContinuousNum)) {
+                //如果已经使用过了,则跳过
+                continue;
+            }
+            Integer indicatorDays = monitoringContinuousNum.getIndicatorDays();
+            int continuousNum = 1;
+            //循环所有逾期的数据
+            for (int i = 0; i < overDueDataList.size(); i++) {
+                //获取当前的逾期数据
+                CoreSafetyExceptionData curData = overDueDataList.get(i);
+                //获取下一个逾期的数据
+                CoreSafetyExceptionData nextData = overDueDataList.get(i + 1);
+                if (nextData == null) {
+                    //如果为null,说明走到了最后一个元素
+                    break;
+                }
+                //当前逾期任务的在原始数据中的下标
+                int curDataIndex = dataList.indexOf(curData);
+                //下一个逾期任务的在原始数据中的下标
+                int nextDataIndex = dataList.indexOf(nextData);
+                //如果两个元素下标相减等于1,说明两个元素相邻,也就是连续逾期未登
+                if (nextDataIndex - curDataIndex == 1) {
+                    continuousNum++;
+                    continue;
+                }
+                if (continuousNum >= indicatorDays) {
+                    //说明已经达到了连续数的要求
+                    double deductScore = continuousNum * monitoringContinuousNum.getItemValue();
+                    //计算连续数
+                    CoreSafetySourceData safeSourceData = doNewSafetySourceData(monitoringContinuousNum, orgId, deductScore, year, month, continuousNum);
+                    sourceDataList.add(safeSourceData);
+                    continuousNum=1;
+                    usedConfigList.add(monitoringContinuousNum);
+                    break;
+                }
+
+
+            }
+
+
+        }
+
+
+    }
+
 
     private void calculateQuestionData(List<SafeIndexRuleCountVo> questionIndexList, List<CoreSafetyExceptionData> dataList, int year, int month, List<SysOrgVO> orgList) {
         //将数据按机构分组
@@ -272,16 +337,17 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
                 //构建执行时刻的map,用于存储每个时刻的异常数据
                 Map<Integer, List<CoreSafetyExceptionData>> execTimeMap = buildExecTimeMap(resumptionExceptionDataListByOrg);
 
+                //营业前
                 if (ObjectUtil.isNotEmpty(resumptionBeforeUndoIndexList)) {
                     List<CoreSafetySourceData> sourceDataList = calculateContinuousCumulativeCount(resumptionBeforeUndoIndexList, execTimeMap.get(2), orgId, year, month);
                     saveSourceData(sourceDataList, resumptionBeforeUndoIndexList.get(0));
                 }
-
+                //营业中
                 if (ObjectUtil.isNotEmpty(resumptionMiddleIndexList)) {
                     List<CoreSafetySourceData> sourceDataList = calculateContinuousCumulativeCount(resumptionMiddleIndexList, execTimeMap.get(3), orgId, year, month);
                     saveSourceData(sourceDataList, resumptionMiddleIndexList.get(0));
                 }
-
+                //营业后
                 if (ObjectUtil.isNotEmpty(resumptionAfterUndoIndexList)) {
                     List<CoreSafetySourceData> sourceDataList = calculateContinuousCumulativeCount(resumptionAfterUndoIndexList, execTimeMap.get(4), orgId, year, month);
                     saveSourceData(sourceDataList, resumptionAfterUndoIndexList.get(0));
@@ -332,18 +398,17 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         AtomicReference<Integer> atomicContinuousThreeDays = new AtomicReference<>(0);
         AtomicReference<Integer> atomicContinuousFiveDays = new AtomicReference<>(0);
         AtomicReference<Integer> atomicContinuousTenDays = new AtomicReference<>(0);
+        //计算连续天数并获取连续天数集合
         List<Map<Integer, List<String>>> mapList = groupContinuousDays(dataTimeList);
         mapList.stream().flatMap(m -> m.entrySet().stream()).forEach(e -> {
             Integer key = e.getKey();
             List<String> value = e.getValue();
-            if (key >= 3) {
-                atomicContinuousThreeDays.getAndSet(atomicContinuousThreeDays.get() + 1);
-            }
-            if (key >= 5) {
-                atomicContinuousFiveDays.getAndSet(atomicContinuousFiveDays.get() + 1);
-            }
             if (key >= 10) {
                 atomicContinuousTenDays.getAndSet(atomicContinuousTenDays.get() + 1);
+            } else if (key >= 5) {
+                atomicContinuousFiveDays.getAndSet(atomicContinuousFiveDays.get() + 1);
+            } else if (key >= 3) {
+                atomicContinuousThreeDays.getAndSet(atomicContinuousThreeDays.get() + 1);
             }
         });
 
@@ -374,6 +439,19 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
 
         return sourceDataList;
     }
+    /*public static void main(String[] args) {
+        String[] dates = {"2022-01-01", "2022-01-02", "2022-01-03", "2022-01-04", "2022-01-06", "2022-01-07", "2022-01-08", "2022-01-09", "2022-01-11"};
+        List<Map<Integer, List<String>>> result = groupContinuousDays(Arrays.asList(dates));
+
+        for (Map<Integer, List<String>> group : result) {
+            for (Map.Entry<Integer, List<String>> entry : group.entrySet()) {
+                int count = entry.getKey();
+                List<String> datesList = entry.getValue();
+                System.out.println("连续天数：" + count);
+                System.out.println("日期集合：" + datesList);
+            }
+        }
+    }*/
 
     public static List<Map<Integer, List<String>>> groupContinuousDays(List<String> days) {
         List<Map<Integer, List<String>>> result = new ArrayList<>();
@@ -407,25 +485,10 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     private List<SafeIndexRuleCountVo> getResumptionUndoIndexList(String pointCode, List<SafeIndexRuleCountVo> resumptionIndexList) {
         return resumptionIndexList.stream()
                 .filter(r -> ObjectUtil.equal(pointCode, r.getPointCode()))
-                .filter(r -> r.getCalculateType() == 1)
+                //.filter(r -> r.getCalculateType().equals(Constants.ONE))
                 .collect(Collectors.toList());
     }
 
-   /* public static void main(String[] args) {
-        String[] dates = {"2022-01-01", "2022-01-02", "2022-01-03", "2022-01-04", "2022-01-06", "2022-01-07", "2022-01-08", "2022-01-09", "2022-01-11"};
-        List<Map<Integer, List<String>>> result = groupContinuousDays(dates);
-
-        for (Map<Integer, List<String>> group : result) {
-            for (Map.Entry<Integer, List<String>> entry : group.entrySet()) {
-                int count = entry.getKey();
-                List<String> datesList = entry.getValue();
-                System.out.println("连续天数：" + count);
-                System.out.println("日期集合：" + datesList);
-            }
-        }
-    }*/
-
-
     private CoreSafetySourceData doNewSafetySourceData(SafeIndexRuleCountVo indexConfigCountVo, Long orgId, double deductScore, int year, int month, int time) {
         CoreSafetySourceData safeSourceData = new CoreSafetySourceData();
         safeSourceData.setId(IdWorker.getId());
@@ -480,9 +543,6 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     }
 
     private void doMonitorExceptionData(DateTime time) {
-        //获取监控调阅的异常数据 ， 扩展字段2=overTime表示逾期数据  扩展字段2=nums表示异常通道数量数据
-        //逾期数据 扩展字段1：周期
-        //异常通道数量数据 扩展字段1：通道数
         List<CoreSafetyExceptionData> resumptionExceptionList = monitoringRetrievalTaskService.selectMonitorExceptionData(time);
         this.saveBatch(resumptionExceptionList);
     }

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskContentMapper.xml

@@ -11,5 +11,7 @@
             core_evaluate_task_user_content
         WHERE
             task_user_id =#{taskUserId}
+        ORDER BY
+            `code`
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -152,7 +152,8 @@
         core_evaluate_task a
         LEFT JOIN core_evaluate_role b ON b.evaluate_id = a.plan_id
         LEFT JOIN sys_role c ON c.id = b.role_id
-        LEFT JOIN core_evaluate_task_content d on d.task_id=a.id
+        LEFT JOIN core_evaluate_task_user e ON e.task_id=a.id
+        LEFT JOIN core_evaluate_task_user_content d on d.task_user_id=e.id
         WHERE
         a. is_deleted =0
         <if test="request.orgId != null ">

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -282,7 +282,7 @@
         now() as createTime
         FROM core_resumption a
         inner join core_resumption_plan p on a.plan_id = p.id
-        where p.plan_cycle in (2, 3, 4) <!--营业前中后-->
+        where p.plan_exec in (2, 3, 4) <!--营业前中后-->
         and ymd_year =#{year}
         and ymd_quarter=#{quarter}
         and ymd_month=#{month}

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -3,7 +3,6 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper">
-
     <resultMap type="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask"
                id="CoreMonitoringRetrievalTaskResult">
         <result property="id" column="id"/>
@@ -85,7 +84,6 @@
             <if test="planId !=null ">
                 and plan_id=#{planId}
             </if>
-
         </where>
     </select>
 
@@ -110,14 +108,14 @@
         <if test="request.cycle != null ">
             and a.cycle = #{request.cycle}
         </if>
-<!--        <if test="request.dateRange != null and request.dateRange.length>0">
-            and a.ymd_date >= #{request.dateRange[0]}
-            and #{request.dateRange[1]}>=a.ymd_date
-        </if>-->
+        <!--        <if test="request.dateRange != null and request.dateRange.length>0">
+                    and a.ymd_date >= #{request.dateRange[0]}
+                    and #{request.dateRange[1]}>=a.ymd_date
+                </if>-->
         <if test="request.dateRange != null and request.dateRange.length>0">
             and (a.plan_start_time BETWEEN #{request.dateRange[0]}
             and #{request.dateRange[1]}
-           OR a.plan_end_time BETWEEN #{request.dateRange[0]}
+            OR a.plan_end_time BETWEEN #{request.dateRange[0]}
             and #{request.dateRange[1]})
         </if>
 
@@ -215,114 +213,163 @@
             and a.role_id = #{request.roleId}
         </if>
         order by a.ymd_date desc
-
     </select>
 
     <insert id="insertCoreMonitoringRetrievalTask"
             parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         insert into core_monitoring_retrieval_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,
+            <if test="id != null">
+                id,
             </if>
-            <if test="planId != null">plan_id,
+            <if test="planId != null">
+                plan_id,
             </if>
-            <if test="taskName != null">task_name,
+            <if test="taskName != null">
+                task_name,
             </if>
-            <if test="orgId != null">org_id,
+            <if test="orgId != null">
+                org_id,
             </if>
-            <if test="orgPath != null">org_path,
+            <if test="orgPath != null">
+                org_path,
             </if>
-            <if test="orgName != null">org_name,
+            <if test="orgName != null">
+                org_name,
             </if>
-            <if test="ymdDate != null">ymd_date,
+            <if test="ymdDate != null">
+                ymd_date,
             </if>
-            <if test="ymdYear != null">ymd_year,
+            <if test="ymdYear != null">
+                ymd_year,
             </if>
-            <if test="ymdHalfyear != null">ymd_halfyear,
+            <if test="ymdHalfyear != null">
+                ymd_halfyear,
             </if>
-            <if test="ymdQuarter != null">ymd_quarter,
+            <if test="ymdQuarter != null">
+                ymd_quarter,
             </if>
-            <if test="ymdMonth != null">ymd_month,
+            <if test="ymdMonth != null">
+                ymd_month,
             </if>
-            <if test="ymdWeek != null">ymd_week,
+            <if test="ymdWeek != null">
+                ymd_week,
             </if>
-            <if test="ymdDay != null">ymd_day,
+            <if test="ymdDay != null">
+                ymd_day,
             </if>
-            <if test="cycle != null">cycle,
+            <if test="cycle != null">
+                cycle,
             </if>
-            <if test="planStartTime != null">plan_start_time,
+            <if test="planStartTime != null">
+                plan_start_time,
             </if>
-            <if test="planEndTime != null">plan_end_time,
+            <if test="planEndTime != null">
+                plan_end_time,
             </if>
-            <if test="startTime != null">start_time,
+            <if test="startTime != null">
+                start_time,
             </if>
-            <if test="endTime != null">end_time,
+            <if test="endTime != null">
+                end_time,
             </if>
-            <if test="status != null">status,
+            <if test="status != null">
+                status,
             </if>
-            <if test="roleId != null">role_id,
+            <if test="roleId != null">
+                role_id,
             </if>
-            <if test="retrievalUser != null">retrieval_user,
+            <if test="retrievalUser != null">
+                retrieval_user,
             </if>
-            <if test="orderNum != null">order_num,
+            <if test="orderNum != null">
+                order_num,
             </if>
-            <if test="batchNum != null">batch_num,
+            <if test="batchNum != null">
+                batch_num,
             </if>
-            <if test="submitTime != null">submit_time,
+            <if test="submitTime != null">
+                submit_time,
             </if>
-            <if test="exceptionCount != null">exception_count,
+            <if test="exceptionCount != null">
+                exception_count,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},
+            <if test="id != null">
+                #{id},
             </if>
-            <if test="planId != null">#{planId},
+            <if test="planId != null">
+                #{planId},
             </if>
-            <if test="taskName != null">#{taskName},
+            <if test="taskName != null">
+                #{taskName},
             </if>
-            <if test="orgId != null">#{orgId},
+            <if test="orgId != null">
+                #{orgId},
             </if>
-            <if test="orgPath != null">#{orgPath},
+            <if test="orgPath != null">
+                #{orgPath},
             </if>
-            <if test="orgName != null">#{orgName},
+            <if test="orgName != null">
+                #{orgName},
             </if>
-            <if test="ymdDate != null">#{ymdDate},
+            <if test="ymdDate != null">
+                #{ymdDate},
             </if>
-            <if test="ymdYear != null">#{ymdYear},
+            <if test="ymdYear != null">
+                #{ymdYear},
             </if>
-            <if test="ymdHalfyear != null">#{ymdHalfyear},
+            <if test="ymdHalfyear != null">
+                #{ymdHalfyear},
             </if>
-            <if test="ymdQuarter != null">#{ymdQuarter},
+            <if test="ymdQuarter != null">
+                #{ymdQuarter},
             </if>
-            <if test="ymdMonth != null">#{ymdMonth},
+            <if test="ymdMonth != null">
+                #{ymdMonth},
             </if>
-            <if test="ymdWeek != null">#{ymdWeek},
+            <if test="ymdWeek != null">
+                #{ymdWeek},
             </if>
-            <if test="ymdDay != null">#{ymdDay},
+            <if test="ymdDay != null">
+                #{ymdDay},
             </if>
-            <if test="cycle != null">#{cycle},
+            <if test="cycle != null">
+                #{cycle},
             </if>
-            <if test="planStartTime != null">#{planStartTime},
+            <if test="planStartTime != null">
+                #{planStartTime},
             </if>
-            <if test="planEndTime != null">#{planEndTime},
+            <if test="planEndTime != null">
+                #{planEndTime},
             </if>
-            <if test="startTime != null">#{startTime},
+            <if test="startTime != null">
+                #{startTime},
             </if>
-            <if test="endTime != null">#{endTime},
+            <if test="endTime != null">
+                #{endTime},
             </if>
-            <if test="status != null">#{status},
+            <if test="status != null">
+                #{status},
             </if>
-            <if test="roleId != null">#{roleId},
+            <if test="roleId != null">
+                #{roleId},
             </if>
-            <if test="retrievalUser != null">#{retrievalUser},
+            <if test="retrievalUser != null">
+                #{retrievalUser},
             </if>
-            <if test="orderNum != null">#{orderNum},
+            <if test="orderNum != null">
+                #{orderNum},
             </if>
-            <if test="batchNum != null">#{batchNum},
+            <if test="batchNum != null">
+                #{batchNum},
             </if>
-            <if test="submitTime != null">#{submitTime},
+            <if test="submitTime != null">
+                #{submitTime},
             </if>
-            <if test="exceptionCount != null">#{exceptionCount},
+            <if test="exceptionCount != null">
+                #{exceptionCount},
             </if>
         </trim>
     </insert>
@@ -331,76 +378,100 @@
             parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         update core_monitoring_retrieval_task
         <trim prefix="SET" suffixOverrides=",">
-            <if test="planId != null">plan_id =
+            <if test="planId != null">
+                plan_id =
                 #{planId},
             </if>
-            <if test="taskName != null">task_name =
+            <if test="taskName != null">
+                task_name =
                 #{taskName},
             </if>
-            <if test="orgId != null">org_id =
+            <if test="orgId != null">
+                org_id =
                 #{orgId},
             </if>
-            <if test="orgPath != null">org_path =
+            <if test="orgPath != null">
+                org_path =
                 #{orgPath},
             </if>
-            <if test="orgName != null">org_name =
+            <if test="orgName != null">
+                org_name =
                 #{orgName},
             </if>
-            <if test="ymdDate != null">ymd_date =
+            <if test="ymdDate != null">
+                ymd_date =
                 #{ymdDate},
             </if>
-            <if test="ymdYear != null">ymd_year =
+            <if test="ymdYear != null">
+                ymd_year =
                 #{ymdYear},
             </if>
-            <if test="ymdHalfyear != null">ymd_halfyear =
+            <if test="ymdHalfyear != null">
+                ymd_halfyear =
                 #{ymdHalfyear},
             </if>
-            <if test="ymdQuarter != null">ymd_quarter =
+            <if test="ymdQuarter != null">
+                ymd_quarter =
                 #{ymdQuarter},
             </if>
-            <if test="ymdMonth != null">ymd_month =
+            <if test="ymdMonth != null">
+                ymd_month =
                 #{ymdMonth},
             </if>
-            <if test="ymdWeek != null">ymd_week =
+            <if test="ymdWeek != null">
+                ymd_week =
                 #{ymdWeek},
             </if>
-            <if test="ymdDay != null">ymd_day =
+            <if test="ymdDay != null">
+                ymd_day =
                 #{ymdDay},
             </if>
-            <if test="cycle != null">cycle =
+            <if test="cycle != null">
+                cycle =
                 #{cycle},
             </if>
-            <if test="planStartTime != null">plan_start_time =
+            <if test="planStartTime != null">
+                plan_start_time =
                 #{planStartTime},
             </if>
-            <if test="planEndTime != null">plan_end_time =
+            <if test="planEndTime != null">
+                plan_end_time =
                 #{planEndTime},
             </if>
-            <if test="startTime != null">start_time =
+            <if test="startTime != null">
+                start_time =
                 #{startTime},
             </if>
-            <if test="endTime != null">end_time =
+            <if test="endTime != null">
+                end_time =
                 #{endTime},
             </if>
-            <if test="status != null">status =
+            <if test="status != null">
+                status =
                 #{status},
             </if>
-            <if test="roleId != null">role_id =
+            <if test="roleId != null">
+                role_id =
                 #{roleId},
             </if>
-            <if test="retrievalUser != null">retrieval_user =
+            <if test="retrievalUser != null">
+                retrieval_user =
                 #{retrievalUser},
             </if>
-            <if test="orderNum != null">order_num =
+            <if test="orderNum != null">
+                order_num =
                 #{orderNum},
             </if>
-            <if test="batchNum != null">batch_num =
+            <if test="batchNum != null">
+                batch_num =
                 #{batchNum},
             </if>
-            <if test="submitTime != null">submit_time =
+            <if test="submitTime != null">
+                submit_time =
                 #{submitTime},
             </if>
-            <if test="exceptionCount != null">exception_count =
+            <if test="exceptionCount != null">
+                exception_count =
                 #{exceptionCount},
             </if>
         </trim>
@@ -410,7 +481,7 @@
         update core_monitoring_retrieval_task
         set status=3
         where #{dateTimeNew} > plan_end_time
-          and status!=2
+          and status != 2
     </update>
 
 
@@ -448,32 +519,49 @@
         where plan_id = #{planId}
     </delete>
     <delete id="deleteDayTaskByPlanId">
-        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_date=#{ymdDate}
-                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id=#{planId})
+        DELETE
+        FROM core_monitoring_retrieval_task
+        WHERE cycle = #{cycle}
+          AND ymd_date = #{ymdDate}
+          AND plan_id IN (SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id = #{planId})
     </delete>
     <delete id="deleteWeekTaskByPlanId">
-        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle}  AND ymd_week=#{week}
-                                                     AND ymd_year=#{year}
-                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE plan_id=#{planId})
+        DELETE
+        FROM core_monitoring_retrieval_task
+        WHERE cycle = #{cycle}
+          AND ymd_week = #{week}
+          AND ymd_year = #{year}
+          AND plan_id IN (SELECT id FROM core_monitoring_retrieval_plan WHERE plan_id = #{planId})
     </delete>
     <delete id="deleteMonthTaskByPlanId">
-        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_month=#{month}
-                                                     AND ymd_year=#{year}
-                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE plan_id=#{planId})
+        DELETE
+        FROM core_monitoring_retrieval_task
+        WHERE cycle = #{cycle}
+          AND ymd_month = #{month}
+          AND ymd_year = #{year}
+          AND plan_id IN (SELECT id FROM core_monitoring_retrieval_plan WHERE plan_id = #{planId})
+    </delete>
+    <delete id="deleteQuarterTaskByPlanId">
     </delete>
-    <delete id="deleteQuarterTaskByPlanId"></delete>
     <delete id="deleteDayTaskByTime">
-        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_date BETWEEN #{startTime} AND #{endTime}
-                                                     AND plan_id IN(SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id=#{planId})
+        DELETE
+        FROM core_monitoring_retrieval_task
+        WHERE cycle = #{cycle}
+          AND ymd_date BETWEEN #{startTime} AND #{endTime}
+          AND plan_id IN (SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id = #{planId})
     </delete>
     <delete id="deleteDayTaskByTimeAndPlanId">
-        DELETE FROM core_monitoring_retrieval_task WHERE cycle = #{cycle} AND ymd_date BETWEEN #{startTime} AND #{endTime}
-                                                     AND plan_id =#{planId}
+        DELETE
+        FROM core_monitoring_retrieval_task
+        WHERE cycle = #{cycle}
+          AND ymd_date BETWEEN #{startTime} AND #{endTime}
+          AND plan_id = #{planId}
     </delete>
     <delete id="deleteAllTaskByPlanIds">
-        delete  FROM core_monitoring_retrieval_task where  plan_id in <foreach collection="planIds" item="id" open="(" close=")">
-        #{id}
-    </foreach>
+        delete FROM core_monitoring_retrieval_task where plan_id in
+        <foreach collection="planIds" item="id" open="(" close=")">
+            #{id}
+        </foreach>
     </delete>
 
 
@@ -483,14 +571,23 @@
         where plan_id = #{planId}
     </update>
     <update id="initializationTask">
-        update core_monitoring_retrieval_task SET `status`=0, start_time=null WHERE `status`=1 AND start_time LIKE  concat(#{dateTime}, '%')
+        update core_monitoring_retrieval_task
+        SET `status`=0,
+            start_time=null
+        WHERE `status` = 1
+          AND start_time LIKE concat(#{dateTime}, '%')
     </update>
     <update id="initializationTaskByHand">
-        update core_monitoring_retrieval_task SET `status`=0, start_time=null WHERE `status`=1 AND id=#{id}
+        update core_monitoring_retrieval_task
+        SET `status`=0,
+            start_time=null
+        WHERE `status` = 1
+          AND id = #{id}
     </update>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-     select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status,
+        select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as
+        endTime,t.status,
         IF
         (
         IF
@@ -500,81 +597,98 @@
         1,
         0
         ) AS isExist
-        from core_monitoring_retrieval_task t 	LEFT JOIN sys_device b ON t.org_id = b.org_id
+        from core_monitoring_retrieval_task t LEFT JOIN sys_device b ON t.org_id = b.org_id
         AND b.del_flag = '0'
         AND b.device_type = '0'
         LEFT JOIN sys_device c ON c.org_id = t.org_id
         AND c.del_flag = '0'
-        AND c.device_type = '2'  where t.org_id =#{request.orgId} and  t.role_id in
-         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
+        AND c.device_type = '2' where t.org_id =#{request.orgId} and t.role_id in
+        <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
-         </foreach>
+        </foreach>
         and t.status in (0,1)
         and ((
-                #{request.startTime}   <![CDATA[<=]]> t.plan_start_time
-                and #{request.endTime} >= t.plan_start_time
-                )
-                or (
-                #{request.startTime}    <![CDATA[<=]]> t.plan_end_time
-                and #{request.endTime} >= t.plan_end_time
-                )
-                or (
-                #{request.startTime} >= t.plan_start_time
-                and #{request.endTime}  <![CDATA[<=]]>  t.plan_end_time
-             ))GROUP BY t.id
+        #{request.startTime}   <![CDATA[<=]]> t.plan_start_time
+        and #{request.endTime} >= t.plan_start_time
+        )
+        or (
+        #{request.startTime}    <![CDATA[<=]]> t.plan_end_time
+        and #{request.endTime} >= t.plan_end_time
+        )
+        or (
+        #{request.startTime} >= t.plan_start_time
+        and #{request.endTime}  <![CDATA[<=]]>  t.plan_end_time
+        ))GROUP BY t.id
     </select>
     <select id="selectTaskByTime" resultType="java.lang.Long">
-        SELECT * FROM core_monitoring_retrieval_task WHERE `status`=1 AND start_time LIKE  concat(#{dateTime}, '%')
+        SELECT *
+        FROM core_monitoring_retrieval_task
+        WHERE `status` = 1
+          AND start_time LIKE concat(#{dateTime}, '%')
     </select>
 
     <select id="selectMonitorOverTimeExceptionData"
             resultType="com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData">
-        SELECT  a.id                             as dataId,
-                a.org_id                         as orgId,
-                a.submit_time                    as dataTime,
-                'core_monitoring_retrieval_task' as dataSource,
-                now()                            as createTime,
-                a.cycle                          as extraField1,
-                'overTime'                       as extraField2
+        SELECT a.id                             as dataId,
+               a.org_id                         as orgId,
+               a.submit_time                    as dataTime,
+               'core_monitoring_retrieval_task' as dataSource,
+               now()                            as createTime,
+               a.cycle                          as extraField1,
+               'overTime'                       as extraField2
         FROM core_monitoring_retrieval_task a
         where a.plan_end_time <![CDATA[<]]> #{time}
-        and a.status = 3
+          and a.status = 3
     </select>
 
     <select id="selectMonitorNumsExceptionData"
             resultType="com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData">
-            SELECT t.id                             as dataId,
-                   t.org_id                         as orgId,
-                   t.submit_time                    as dataTime,
-                   'core_monitoring_retrieval_task' as dataSource,
-                   now()                            as createTime,
-                   count(t1.mid)                    as extraField1,  <!--异常通道数量-->
-                   'nums'                           as extraField2
-            FROM core_monitoring_retrieval_task t
-                     inner join core_monitoring_task_registration tr on t.id = tr.task_id
-                     inner join core_monitoring_task_registration_monitor trm on tr.id = trm.task_registration_id
-                     inner join (select distinct m.id as mid, m.video_channel as channelId
-                                 from core_monitoring_task_registration_monitor m
-                                          inner join core_monitoring_task_monitor_info i on m.id = i.task_monitor_id
-                                 where i.situation = 1) t1 on trm.id=t1.mid
-            where t.plan_end_time <![CDATA[<]]> #{time}
+        SELECT t.id as dataId,
+        t.org_id as orgId,
+        t.submit_time as dataTime,
+        'core_monitoring_retrieval_task' as dataSource,
+        now() as createTime,
+        count(t1.mid) as extraField1,  <!--异常通道数量-->
+        'nums' as extraField2
+        FROM core_monitoring_retrieval_task t
+        inner join core_monitoring_task_registration tr on t.id = tr.task_id
+        inner join core_monitoring_task_registration_monitor trm on tr.id = trm.task_registration_id
+        inner join (select distinct m.id as mid, m.video_channel as channelId
+        from core_monitoring_task_registration_monitor m
+        inner join core_monitoring_task_monitor_info i on m.id = i.task_monitor_id
+        where i.situation = 1) t1 on trm.id=t1.mid
+        where t.plan_end_time <![CDATA[<]]> #{time}
     </select>
     <select id="selectCompleteByPlanId"
             resultType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
-        SELECT
-            *
-        FROM
-            core_monitoring_retrieval_task
-        WHERE
-            plan_id = #{planId}
-        and    `status` IN (2,3)
+        SELECT *
+        FROM core_monitoring_retrieval_task
+        WHERE plan_id = #{planId}
+          and `status` IN (2, 3)
     </select>
     <select id="selectTaskList"
             resultType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
-       select * from  core_monitoring_retrieval_task where ymd_date = #{taskTime} and cycle=#{cycle} and org_id in
+        select * from core_monitoring_retrieval_task where ymd_date = #{taskTime} and cycle=#{cycle} and org_id in
         <foreach item="orgId" collection="orgIds" open="(" separator="," close=")">
             #{orgId}
         </foreach>
+    </select>
+
+    <select id="selectMonitorExceptionData"
+            resultType="com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData">
+        SELECT t.id as dataId,
+        t.org_id as orgId,
+        date_format(t.plan_start_time,'%Y-%m-%d') as dataTime,
+        'core_monitoring_retrieval_task' as dataSource,
+        now() as createTime,
+        t.status as extraField1,
+        t.plan_id as extraField2
 
+        FROM core_monitoring_retrieval_task t where
+        t.ymd_year =#{year}
+        and t.ymd_quarter=#{quarter}
+        and t.ymd_month=#{month}
+        <!--and t.status =3-->
+        and t.role_id = #{roleId}
     </select>
 </mapper>

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

@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhMapper">
+
+    <resultMap type="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh" id="CoreSafetyBookAqbwbndjhResult">
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="date" column="date"/>
+        <result property="content" column="content"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="images" column="images"/>
+        <result property="orgId" column="org_id"/>
+    </resultMap>
+
+    <sql id="selectCoreSafetyBookAqbwbndjhVo">
+        select id,
+               title,
+               date,
+               content,
+               create_time,
+               update_time,
+               create_by,
+               update_by,
+               images,
+               org_id
+        from core_safety_book_aqbwbndjh
+    </sql>
+
+    <select id="selectCoreSafetyBookAqbwbndjhList"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh"
+            resultMap="CoreSafetyBookAqbwbndjhResult">
+        <include refid="selectCoreSafetyBookAqbwbndjhVo"/>
+        <where>
+            <if test="title != null  and title != ''">
+                and title = #{title}
+            </if>
+            <if test="date != null ">
+                and date = #{date}
+            </if>
+            <if test="content != null  and content != ''">
+                and content = #{content}
+            </if>
+            <if test="images != null  and images != ''">
+                and images = #{images}
+            </if>
+            <if test="orgId != null ">
+                and org_id = #{orgId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCoreSafetyBookAqbwbndjhById" parameterType="Long"
+            resultMap="CoreSafetyBookAqbwbndjhResult">
+        <include refid="selectCoreSafetyBookAqbwbndjhVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectAqbwbndjhPage" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh">
+        select a.id,
+        a.title,
+        a.date,
+        a.content,
+        a.create_time,
+        a.update_time,
+        a.create_by,
+        a.update_by,
+        a.images,
+        a.org_id,
+        u2.name as userName,
+        o.name as orgName,
+        group_concat(u.name) as userNames
+        from core_safety_book_aqbwbndjh a
+        left join core_safety_book_aqbwbndjh_user au on au.aqbwbndjh_id=a.id
+        left join sys_user u on u.id=au.user_id
+        left join sys_user u2 on u2.id=a.create_by
+        left join sys_org o on o.id=a.org_id
+        <where>
+
+            <if test="aq.date != null ">
+                and a.date = #{aq.date}
+            </if>
+
+
+        </where>
+        group by a.id,a.create_time
+        order by a.create_time desc
+    </select>
+    <select id="selectAqbwbndjhById" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh">
+        select a.id,
+               a.title,
+               a.date,
+               a.content,
+               a.create_time,
+               a.update_time,
+               a.create_by,
+               a.update_by,
+               a.images,
+               a.org_id,
+               group_concat(u.name) as userNames
+        from core_safety_book_aqbwbndjh a
+                 left join core_safety_book_aqbwbndjh_user au on au.aqbwbndjh_id = a.id
+                 left join sys_user u on u.id = au.user_id
+        where a.id = #{id}
+        group by a.id
+
+    </select>
+
+    <insert id="insertCoreSafetyBookAqbwbndjh"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh">
+        insert into core_safety_book_aqbwbndjh
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,
+            </if>
+            <if test="title != null">title,
+            </if>
+            <if test="date != null">date,
+            </if>
+            <if test="content != null">content,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="images != null">images,
+            </if>
+            <if test="orgId != null">org_id,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},
+            </if>
+            <if test="title != null">#{title},
+            </if>
+            <if test="date != null">#{date},
+            </if>
+            <if test="content != null">#{content},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="images != null">#{images},
+            </if>
+            <if test="orgId != null">#{orgId},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreSafetyBookAqbwbndjh"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh">
+        update core_safety_book_aqbwbndjh
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title =
+                #{title},
+            </if>
+            <if test="date != null">date =
+                #{date},
+            </if>
+            <if test="content != null">content =
+                #{content},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="images != null">images =
+                #{images},
+            </if>
+            <if test="orgId != null">org_id =
+                #{orgId},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreSafetyBookAqbwbndjhById" parameterType="Long">
+        delete
+        from core_safety_book_aqbwbndjh
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreSafetyBookAqbwbndjhByIds" parameterType="String">
+        delete from core_safety_book_aqbwbndjh where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhUserMapper">
+
+    <resultMap type="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser"
+               id="CoreSafetyBookAqbwbndjhUserResult">
+        <result property="id" column="id"/>
+        <result property="aqbwbndjhId" column="aqbwbndjh_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <sql id="selectCoreSafetyBookAqbwbndjhUserVo">
+        select id, aqbwbndjh_id, user_id, create_time, update_time, create_by, update_by
+        from core_safety_book_aqbwbndjh_user
+    </sql>
+
+    <select id="selectCoreSafetyBookAqbwbndjhUserList"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser"
+            resultMap="CoreSafetyBookAqbwbndjhUserResult">
+        <include refid="selectCoreSafetyBookAqbwbndjhUserVo"/>
+        <where>
+            <if test="aqbwbndjhId != null ">
+                and aqbwbndjh_id = #{aqbwbndjhId}
+            </if>
+            <if test="userId != null ">
+                and user_id = #{userId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCoreSafetyBookAqbwbndjhUserById" parameterType="Long"
+            resultMap="CoreSafetyBookAqbwbndjhUserResult">
+        <include refid="selectCoreSafetyBookAqbwbndjhUserVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertCoreSafetyBookAqbwbndjhUser"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser">
+        insert into core_safety_book_aqbwbndjh_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,
+            </if>
+            <if test="aqbwbndjhId != null">aqbwbndjh_id,
+            </if>
+            <if test="userId != null">user_id,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},
+            </if>
+            <if test="aqbwbndjhId != null">#{aqbwbndjhId},
+            </if>
+            <if test="userId != null">#{userId},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreSafetyBookAqbwbndjhUser"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser">
+        update core_safety_book_aqbwbndjh_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="aqbwbndjhId != null">aqbwbndjh_id =
+                #{aqbwbndjhId},
+            </if>
+            <if test="userId != null">user_id =
+                #{userId},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreSafetyBookAqbwbndjhUserById" parameterType="Long">
+        delete
+        from core_safety_book_aqbwbndjh_user
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreSafetyBookAqbwbndjhUserByIds" parameterType="String">
+        delete from core_safety_book_aqbwbndjh_user where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjMapper">
+
+    <resultMap type="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj" id="CoreSafetyBookHsggbsdjResult">
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="date" column="date"/>
+        <result property="content" column="content"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="images" column="images"/>
+    </resultMap>
+
+    <sql id="selectCoreSafetyBookHsggbsdjVo">
+        select id,
+               title,
+               date,
+               content,
+               create_time,
+               update_time,
+               create_by,
+               update_by,
+               images
+        from core_safety_book_hsggbsdj
+    </sql>
+
+    <select id="selectCoreSafetyBookHsggbsdjList"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj"
+            resultMap="CoreSafetyBookHsggbsdjResult">
+        <include refid="selectCoreSafetyBookHsggbsdjVo"/>
+        <where>
+            <if test="title != null  and title != ''">
+                and title = #{title}
+            </if>
+            <if test="date != null ">
+                and date = #{date}
+            </if>
+            <if test="content != null  and content != ''">
+                and content = #{content}
+            </if>
+            <if test="images != null  and images != ''">
+                and images = #{images}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCoreSafetyBookHsggbsdjById" parameterType="Long"
+            resultMap="CoreSafetyBookHsggbsdjResult">
+        <include refid="selectCoreSafetyBookHsggbsdjVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectHsggbsdjPage" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
+        SELECT
+            h.id,
+            h.title,
+            h.date,
+            h.content,
+            h.create_time,
+            h.update_time,
+            h.create_by,
+            h.update_by,
+            h.images,
+            group_concat( u.NAME ) AS userNames
+        FROM
+            core_safety_book_hsggbsdj h
+                LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
+                LEFT JOIN sys_user u ON u.id = hu.user_id
+        GROUP BY
+            h.id
+        <where>
+            <if test="hs.title != null  and hs.title != ''">
+                and title like concat(concat('%', #{hs.title}),'%')
+            </if>
+            <if test="hs.date != null ">
+                and date = #{hs.date}
+            </if>
+
+        </where>
+    </select>
+    <select id="selectHsggbsdjById" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
+        SELECT
+        h.id,
+        h.title,
+        h.date,
+        h.content,
+        h.create_time,
+        h.update_time,
+        h.create_by,
+        h.update_by,
+        h.images,
+        group_concat( u.NAME ) AS userNames
+        FROM
+        core_safety_book_hsggbsdj h
+        LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
+        LEFT JOIN sys_user u ON u.id = hu.user_id
+        where h.id=#{id}
+        GROUP BY
+        h.id,h.create_time
+        order by h.create_time desc
+
+    </select>
+
+    <insert id="insertCoreSafetyBookHsggbsdj" parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
+        insert into core_safety_book_hsggbsdj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,
+            </if>
+            <if test="title != null">title,
+            </if>
+            <if test="date != null">date,
+            </if>
+            <if test="content != null">content,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="images != null">images,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},
+            </if>
+            <if test="title != null">#{title},
+            </if>
+            <if test="date != null">#{date},
+            </if>
+            <if test="content != null">#{content},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="images != null">#{images},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreSafetyBookHsggbsdj" parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
+        update core_safety_book_hsggbsdj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title =
+                #{title},
+            </if>
+            <if test="date != null">date =
+                #{date},
+            </if>
+            <if test="content != null">content =
+                #{content},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="images != null">images =
+                #{images},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreSafetyBookHsggbsdjById" parameterType="Long">
+        delete
+        from core_safety_book_hsggbsdj
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreSafetyBookHsggbsdjByIds" parameterType="String">
+        delete from core_safety_book_hsggbsdj where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper">
+
+    <resultMap type="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser"
+               id="CoreSafetyBookHsggbsdjUserResult">
+        <result property="id" column="id"/>
+        <result property="hsggbsdjId" column="hsggbsdj_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <sql id="selectCoreSafetyBookHsggbsdjUserVo">
+        select id, hsggbsdj_id, user_id, create_time, update_time, create_by, update_by
+        from core_safety_book_hsggbsdj_user
+    </sql>
+
+    <select id="selectCoreSafetyBookHsggbsdjUserList"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser"
+            resultMap="CoreSafetyBookHsggbsdjUserResult">
+        <include refid="selectCoreSafetyBookHsggbsdjUserVo"/>
+        <where>
+            <if test="hsggbsdjId != null ">
+                and hsggbsdj_id = #{hsggbsdjId}
+            </if>
+            <if test="userId != null ">
+                and user_id = #{userId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCoreSafetyBookHsggbsdjUserById" parameterType="Long"
+            resultMap="CoreSafetyBookHsggbsdjUserResult">
+        <include refid="selectCoreSafetyBookHsggbsdjUserVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertCoreSafetyBookHsggbsdjUser"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser">
+        insert into core_safety_book_hsggbsdj_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,
+            </if>
+            <if test="hsggbsdjId != null">hsggbsdj_id,
+            </if>
+            <if test="userId != null">user_id,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},
+            </if>
+            <if test="hsggbsdjId != null">#{hsggbsdjId},
+            </if>
+            <if test="userId != null">#{userId},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreSafetyBookHsggbsdjUser"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser">
+        update core_safety_book_hsggbsdj_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="hsggbsdjId != null">hsggbsdj_id =
+                #{hsggbsdjId},
+            </if>
+            <if test="userId != null">user_id =
+                #{userId},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreSafetyBookHsggbsdjUserById" parameterType="Long">
+        delete
+        from core_safety_book_hsggbsdj_user
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreSafetyBookHsggbsdjUserByIds" parameterType="String">
+        delete from core_safety_book_hsggbsdj_user where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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