Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.3

project_data/sql/0.0.3/soc/soc.sql

@@ -831,7 +831,7 @@ ALTER TABLE `core_protection_log`
 MODIFY COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
 -- 修改安全指数机构分数表机构path字段长度
 alter table core_safe_month_score modify org_path varchar(225) null comment '机构path';
-DELETE FROM sys_menu WHERE id IN(01724607752400044034,01723993298998222849,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585,1722135552494403586,01722523915868221442,01724355771043504129);
+DELETE FROM sys_menu WHERE id IN(01724607752400044034,01723993298998222849,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585,1722135552494403586,01722523915868221442,01724355771043504129,01726904309791121409);
 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 (01719287834364436482, '统计报表', 0, 1, 'reportForms', NULL, NULL, 1, 0, 'M', '0', '0', null, '1', 'chart', 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`)
@@ -855,7 +855,7 @@ VALUES (01726904309791121409, '网点负责人自查报表', 1719287834364436482
 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 (1722135552494403586, '登记簿批量导出', 1719287834364436482, 10, 'code/registerbook', 'registerBook/index', null, 1, 0, 'C', '0', '0', 'core:registerBook:list', '1', 'education', null, null, now(), null, now(), null);
 
-delete from sys_role_menu where menu_id IN(01726904309791121409,01724355771043504129,01723993298998222849,01722523915868221442,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585);
+delete from sys_role_menu where menu_id IN(01726904309791121409,01724355771043504129,01723993298998222849,01722523915868221442,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585,01724607752400044034);
 
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01726904309791121409);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01726904309791121409);
@@ -1104,7 +1104,7 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 0172213397111179
 -- 出入事项审批
 DELETE FROM sys_menu WHERE id IN(01722459057471643650,01722497238984318978,01722551208603836417);
 
-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 (01722459057471643650, '出入事项审批', 1712729517575520258, 1, 'core/letter/approve', 'core/outIn/approve/index', NULL, 1, 0, 'C', '0', '0', 'core:letter:approveList', '1', 'validCode', NULL, '超级管理员', '2023-11-09 11:40:15', '超级管理员', '2023-11-09 11:47:28', '');
+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 (01722459057471643650, '来访事项审批', 1712729517575520258, 1, 'core/letter/approve', 'core/outIn/approve/index', NULL, 1, 0, 'C', '0', '0', 'core:letter:approveList', '1', 'validCode', NULL, '超级管理员', '2023-11-09 11:40:15', '超级管理员', '2023-11-09 11:47:28', '');
 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 (01722497238984318978, '查询', 1722459057471643650, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:query', '1', NULL, NULL, '超级管理员', '2023-11-09 14:11:58', '超级管理员', '2023-11-13 18:38:23', '');
 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 (01722551208603836417, '审核', 1722459057471643650, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:approve', '1', NULL, NULL, '超级管理员', '2023-11-09 17:46:26', '', NULL, '');
 
@@ -1115,7 +1115,7 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 0172255120860383
 
 -- 出入情况查询
 DELETE FROM sys_menu WHERE id IN(01722881657557610498,01722883092282208257);
-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 (01722881657557610498, '出入情况查询', 1712729517575520258, 3, 'core/outin/record', 'core/outIn/outInLog/index', NULL, 1, 0, 'C', '0', '0', 'core:record:list', '1', 'log', NULL, '超级管理员', '2023-11-10 15:39:31', '超级管理员', '2023-11-10 15:40:48', '');
+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 (01722881657557610498, '来访情况跟踪', 1712729517575520258, 3, 'core/outin/record', 'core/outIn/outInLog/index', NULL, 1, 0, 'C', '0', '0', 'core:record:list', '1', 'log', NULL, '超级管理员', '2023-11-10 15:39:31', '超级管理员', '2023-11-10 15:40:48', '');
 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 (01722883092282208257, '查询', 1722881657557610498, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:record:list', '1', NULL, NULL, '超级管理员', '2023-11-10 15:45:13', '', NULL, '');
 
 DELETE FROM `sys_role_menu` WHERE menu_id IN(01722881657557610498,01722883092282208257);
@@ -1147,7 +1147,7 @@ INSERT INTO `soc`.`sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path
 
 -- 出入人员登记
 DELETE FROM sys_menu WHERE id IN(01719180104111788033,01724016270912864258,01724016373870444545);
-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 (01719180104111788033, '出入人员登记', 1719176094776664066, 3, '/visitRecord', NULL, NULL, 1, 0, 'C', '0', '0', 'core:record:list', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcExsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHS6r07EAAAAEHRSTlMAIKDQEPAwQIDAUJDgcGCwLB1LQwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAghJREFUWIXtmNGOhCAMRasCgqjD/3/tBtSRAiOtzmazCfdR67GU0gLQ1NTU9FfqRo7ITlrH0qzw50prrQrYkYd1ziDqsD0TGVdzuS76eD2eDRk4cE1HiVinE+50/syWuC8KNQwbcZWMRpE67Lkkb4NsxBVDHJ2pwCVjkXWPoq6/xV3cr3DT/EwXzE2ukBgrL0bG4Q6Ju8sny95VZK6s80w9LGvYzWq3XpNX+XJ7c+caVu7Wc7Ig/KsOhJ3L3FFXNO3WFkTqgwIw6Sxx520WWXTXQDGpJY8bai2q2TYksxSpJYc7+mgogPWMsNmS+dm6gJBjvQB1xNj7afJlzOf6ujAoEOY9Z3lwI+5iKto9UpuX094RlmJw2eviLLorwCiDnyYPbsSVFerOPVPMAgjtO4KRWXGIuNVdREiwqKO5fieUujxz3jo0qrT13OcaV/D3ORe1nkINu8lVMVZWmjidi/q6LM/WHS6qYmvNmsxFDbiUsTe5sbvXqcDjRk0irzIPuOQM43HPJKtlGI97ThvtiMHlymqG8bj7eYG2s2dwfcmRPf2YReVOxlLSgMSd4h1QcFWMNjuhsLl4Rz4fjx5zX4jrKtZ0rnjFnV9/jfvIunEb979zLzdwSAOLK4ngzjgW17m5dgrwGs76Q+VyROMqLpZ6ybTWTxaxCldwn8S5nqRfXTU1NTUhAcAPovdX9YWaiFoAAAAASUVORK5CYII=', NULL, '超级管理员', '2023-10-31 10:30:52', '超级管理员', '2023-11-13 18:54:33', '');
+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 (01719180104111788033, '来访核验登记', 1719176094776664066, 3, '/visitRecord', NULL, NULL, 1, 0, 'C', '0', '0', 'core:record:list', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcExsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHS6r07EAAAAEHRSTlMAIKDQEPAwQIDAUJDgcGCwLB1LQwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAghJREFUWIXtmNGOhCAMRasCgqjD/3/tBtSRAiOtzmazCfdR67GU0gLQ1NTU9FfqRo7ITlrH0qzw50prrQrYkYd1ziDqsD0TGVdzuS76eD2eDRk4cE1HiVinE+50/syWuC8KNQwbcZWMRpE67Lkkb4NsxBVDHJ2pwCVjkXWPoq6/xV3cr3DT/EwXzE2ukBgrL0bG4Q6Ju8sny95VZK6s80w9LGvYzWq3XpNX+XJ7c+caVu7Wc7Ig/KsOhJ3L3FFXNO3WFkTqgwIw6Sxx520WWXTXQDGpJY8bai2q2TYksxSpJYc7+mgogPWMsNmS+dm6gJBjvQB1xNj7afJlzOf6ujAoEOY9Z3lwI+5iKto9UpuX094RlmJw2eviLLorwCiDnyYPbsSVFerOPVPMAgjtO4KRWXGIuNVdREiwqKO5fieUujxz3jo0qrT13OcaV/D3ORe1nkINu8lVMVZWmjidi/q6LM/WHS6qYmvNmsxFDbiUsTe5sbvXqcDjRk0irzIPuOQM43HPJKtlGI97ThvtiMHlymqG8bj7eYG2s2dwfcmRPf2YReVOxlLSgMSd4h1QcFWMNjuhsLl4Rz4fjx5zX4jrKtZ0rnjFnV9/jfvIunEb979zLzdwSAOLK4ngzjgW17m5dgrwGs76Q+VyROMqLpZ6ybTWTxaxCldwn8S5nqRfXTU1NTUhAcAPovdX9YWaiFoAAAAASUVORK5CYII=', NULL, '超级管理员', '2023-10-31 10:30:52', '超级管理员', '2023-11-13 18:54:33', '');
 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 (01724016270912864258, '新增', 1719180104111788033, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:record:add', '0', NULL, NULL, '超级管理员', '2023-11-13 18:48: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 (01724016373870444545, '修改', 1719180104111788033, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:record:edit', '0', NULL, NULL, '超级管理员', '2023-11-13 18:48:28', '', NULL, '');
 
@@ -1159,7 +1159,7 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 0172401637387044
 
 -- 出入事项审批
 DELETE FROM sys_menu WHERE id IN(01721714093297004546,01724017039149973506);
-INSERT INTO `soc`.`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 (01721714093297004546, '出入事项审批', 1719176094776664066, 2, '/visitCheck', NULL, NULL, 1, 0, 'C', '0', '0', 'core:letter:approveList', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcExsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHS6r07EAAAAEHRSTlMAIKDQEPAwQIDAUJDgcGCwLB1LQwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAghJREFUWIXtmNGOhCAMRasCgqjD/3/tBtSRAiOtzmazCfdR67GU0gLQ1NTU9FfqRo7ITlrH0qzw50prrQrYkYd1ziDqsD0TGVdzuS76eD2eDRk4cE1HiVinE+50/syWuC8KNQwbcZWMRpE67Lkkb4NsxBVDHJ2pwCVjkXWPoq6/xV3cr3DT/EwXzE2ukBgrL0bG4Q6Ju8sny95VZK6s80w9LGvYzWq3XpNX+XJ7c+caVu7Wc7Ig/KsOhJ3L3FFXNO3WFkTqgwIw6Sxx520WWXTXQDGpJY8bai2q2TYksxSpJYc7+mgogPWMsNmS+dm6gJBjvQB1xNj7afJlzOf6ujAoEOY9Z3lwI+5iKto9UpuX094RlmJw2eviLLorwCiDnyYPbsSVFerOPVPMAgjtO4KRWXGIuNVdREiwqKO5fieUujxz3jo0qrT13OcaV/D3ORe1nkINu8lVMVZWmjidi/q6LM/WHS6qYmvNmsxFDbiUsTe5sbvXqcDjRk0irzIPuOQM43HPJKtlGI97ThvtiMHlymqG8bj7eYG2s2dwfcmRPf2YReVOxlLSgMSd4h1QcFWMNjuhsLl4Rz4fjx5zX4jrKtZ0rnjFnV9/jfvIunEb979zLzdwSAOLK4ngzjgW17m5dgrwGs76Q+VyROMqLpZ6ybTWTxaxCldwn8S5nqRfXTU1NTUhAcAPovdX9YWaiFoAAAAASUVORK5CYII=', NULL, '超级管理员', '2023-11-07 10:20:02', '超级管理员', '2023-11-13 18:55:10', '');
+INSERT INTO `soc`.`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 (01721714093297004546, '来访审批', 1719176094776664066, 2, '/visitCheck', NULL, NULL, 1, 0, 'C', '0', '0', 'core:letter:approveList', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcExsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHS6r07EAAAAEHRSTlMAIKDQEPAwQIDAUJDgcGCwLB1LQwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAghJREFUWIXtmNGOhCAMRasCgqjD/3/tBtSRAiOtzmazCfdR67GU0gLQ1NTU9FfqRo7ITlrH0qzw50prrQrYkYd1ziDqsD0TGVdzuS76eD2eDRk4cE1HiVinE+50/syWuC8KNQwbcZWMRpE67Lkkb4NsxBVDHJ2pwCVjkXWPoq6/xV3cr3DT/EwXzE2ukBgrL0bG4Q6Ju8sny95VZK6s80w9LGvYzWq3XpNX+XJ7c+caVu7Wc7Ig/KsOhJ3L3FFXNO3WFkTqgwIw6Sxx520WWXTXQDGpJY8bai2q2TYksxSpJYc7+mgogPWMsNmS+dm6gJBjvQB1xNj7afJlzOf6ujAoEOY9Z3lwI+5iKto9UpuX094RlmJw2eviLLorwCiDnyYPbsSVFerOPVPMAgjtO4KRWXGIuNVdREiwqKO5fieUujxz3jo0qrT13OcaV/D3ORe1nkINu8lVMVZWmjidi/q6LM/WHS6qYmvNmsxFDbiUsTe5sbvXqcDjRk0irzIPuOQM43HPJKtlGI97ThvtiMHlymqG8bj7eYG2s2dwfcmRPf2YReVOxlLSgMSd4h1QcFWMNjuhsLl4Rz4fjx5zX4jrKtZ0rnjFnV9/jfvIunEb979zLzdwSAOLK4ngzjgW17m5dgrwGs76Q+VyROMqLpZ6ybTWTxaxCldwn8S5nqRfXTU1NTUhAcAPovdX9YWaiFoAAAAASUVORK5CYII=', NULL, '超级管理员', '2023-11-07 10:20:02', '超级管理员', '2023-11-13 18:55:10', '');
 INSERT INTO `soc`.`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 (01724017039149973506, '审批', 1721714093297004546, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:approve', '0', NULL, NULL, '超级管理员', '2023-11-13 18:51:07', '', NULL, '');
 
 DELETE FROM `sys_role_menu` WHERE menu_id IN(01721714093297004546,01724017039149973506);
@@ -1169,7 +1169,7 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 0172401703914997
 
 -- 出入事项申请
 DELETE FROM sys_menu WHERE id IN(01721714556507549698,01724017221941936130,01724017294985740290,01724017404872310786);
-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 (01721714556507549698, '出入事项申请', 1719176094776664066, 1, '/visitRegister', NULL, NULL, 1, 0, 'C', '0', '0', 'core:letter:query', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcExsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHS6r07EAAAAEHRSTlMAIKDQEPAwQIDAUJDgcGCwLB1LQwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAghJREFUWIXtmNGOhCAMRasCgqjD/3/tBtSRAiOtzmazCfdR67GU0gLQ1NTU9FfqRo7ITlrH0qzw50prrQrYkYd1ziDqsD0TGVdzuS76eD2eDRk4cE1HiVinE+50/syWuC8KNQwbcZWMRpE67Lkkb4NsxBVDHJ2pwCVjkXWPoq6/xV3cr3DT/EwXzE2ukBgrL0bG4Q6Ju8sny95VZK6s80w9LGvYzWq3XpNX+XJ7c+caVu7Wc7Ig/KsOhJ3L3FFXNO3WFkTqgwIw6Sxx520WWXTXQDGpJY8bai2q2TYksxSpJYc7+mgogPWMsNmS+dm6gJBjvQB1xNj7afJlzOf6ujAoEOY9Z3lwI+5iKto9UpuX094RlmJw2eviLLorwCiDnyYPbsSVFerOPVPMAgjtO4KRWXGIuNVdREiwqKO5fieUujxz3jo0qrT13OcaV/D3ORe1nkINu8lVMVZWmjidi/q6LM/WHS6qYmvNmsxFDbiUsTe5sbvXqcDjRk0irzIPuOQM43HPJKtlGI97ThvtiMHlymqG8bj7eYG2s2dwfcmRPf2YReVOxlLSgMSd4h1QcFWMNjuhsLl4Rz4fjx5zX4jrKtZ0rnjFnV9/jfvIunEb979zLzdwSAOLK4ngzjgW17m5dgrwGs76Q+VyROMqLpZ6ybTWTxaxCldwn8S5nqRfXTU1NTUhAcAPovdX9YWaiFoAAAAASUVORK5CYII=', NULL, '超级管理员', '2023-11-07 10:21:53', '超级管理员', '2023-11-13 18:54:47', '');
+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 (01721714556507549698, '来访申请', 1719176094776664066, 1, '/visitRegister', NULL, NULL, 1, 0, 'C', '0', '0', 'core:letter:query', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcExsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHRsnHS6r07EAAAAEHRSTlMAIKDQEPAwQIDAUJDgcGCwLB1LQwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAghJREFUWIXtmNGOhCAMRasCgqjD/3/tBtSRAiOtzmazCfdR67GU0gLQ1NTU9FfqRo7ITlrH0qzw50prrQrYkYd1ziDqsD0TGVdzuS76eD2eDRk4cE1HiVinE+50/syWuC8KNQwbcZWMRpE67Lkkb4NsxBVDHJ2pwCVjkXWPoq6/xV3cr3DT/EwXzE2ukBgrL0bG4Q6Ju8sny95VZK6s80w9LGvYzWq3XpNX+XJ7c+caVu7Wc7Ig/KsOhJ3L3FFXNO3WFkTqgwIw6Sxx520WWXTXQDGpJY8bai2q2TYksxSpJYc7+mgogPWMsNmS+dm6gJBjvQB1xNj7afJlzOf6ujAoEOY9Z3lwI+5iKto9UpuX094RlmJw2eviLLorwCiDnyYPbsSVFerOPVPMAgjtO4KRWXGIuNVdREiwqKO5fieUujxz3jo0qrT13OcaV/D3ORe1nkINu8lVMVZWmjidi/q6LM/WHS6qYmvNmsxFDbiUsTe5sbvXqcDjRk0irzIPuOQM43HPJKtlGI97ThvtiMHlymqG8bj7eYG2s2dwfcmRPf2YReVOxlLSgMSd4h1QcFWMNjuhsLl4Rz4fjx5zX4jrKtZ0rnjFnV9/jfvIunEb979zLzdwSAOLK4ngzjgW17m5dgrwGs76Q+VyROMqLpZ6ybTWTxaxCldwn8S5nqRfXTU1NTUhAcAPovdX9YWaiFoAAAAASUVORK5CYII=', NULL, '超级管理员', '2023-11-07 10:21:53', '超级管理员', '2023-11-13 18:54:47', '');
 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 (01724017221941936130, '新增', 1721714556507549698, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:add', '0', NULL, NULL, '超级管理员', '2023-11-13 18:51:51', '', 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 (01724017294985740290, '修改', 1721714556507549698, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:edit', '0', NULL, NULL, '超级管理员', '2023-11-13 18:52:08', '', 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 (01724017404872310786, '删除', 1721714556507549698, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:remove', '0', NULL, NULL, '超级管理员', '2023-11-13 18:52:34', '', NULL, '');
@@ -1345,6 +1345,9 @@ VALUES (1, '灭火器', '3', 'sys_device_type', null, 'default', 'N', '0', '超
 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, '过滤式消防自助呼吸器', '4', 'sys_device_type', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
 
+DELETE FROM `sys_menu` where id =00000000000000002318;
+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, 'saftask', 'safetycheck/task/index', NULL, 1, 0, 'C', '0', '0', 'core:task:list', '1', 'documentation', NULL, '超级管理员', '2023-09-21 10:37:52', '省联社账号', '2023-11-21 16:41:17', '');
+
 delete from sys_dict_data where dict_type='science_protection';
 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 (3, '硬盘录像机', '0', 'science_protection', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
@@ -1402,15 +1405,26 @@ ALTER TABLE `core_introduce_letter_user`
 
 END IF;
 
+-- 监控调阅时长
+IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'core_monitoring_task_registration'
+                    AND column_name = 'average_duration') THEN
+ALTER TABLE `core_monitoring_task_registration`
+    ADD COLUMN `average_duration` double DEFAULT '0' COMMENT '平均调阅时长';
 
+END IF;
 
 END ??
 DELIMITER;
 CALL schema_change ();
 
+UPDATE `sys_menu` SET `menu_name` = '来访管理',`icon`='#' WHERE `menu_name` = '出入管理' AND `parent_id` = 0 AND platform_type=1;
+UPDATE `sys_menu` SET `menu_name` = '来访•核验',`order_num`=2  WHERE `menu_name` = '来访' AND `parent_id` = 0 AND platform_type=0;
 
 -- 调整移动端菜单分组 开始
-UPDATE `sys_menu` SET `menu_name` = '来访管理',`order_num`=2  WHERE `menu_name` = '来访' AND `parent_id` = 0 AND platform_type=0;
+UPDATE `sys_menu` SET `menu_name` = '来访•核验',`order_num`=2  WHERE `menu_name` = '来访' AND `parent_id` = 0 AND platform_type=0;
 DELETE FROM sys_menu WHERE id IN(01726899190588432386,01726899481861873666,01726900357129232386);
 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 (01726899190588432386, '培训•演练', 0, 3, '‘’', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '0', '#', NULL, '超级管理员', '2023-11-21 17:44:07', '', 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 (01726899481861873666, '设置•管理', 0, 4, '‘’', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '0', '#', NULL, '超级管理员', '2023-11-21 17:45:17', '', NULL, '');

soc-auth/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreOutInRecordVo.java

@@ -121,7 +121,10 @@ public class CoreOutInRecordVo{
     @JsonFormat(pattern = "yyyy年MM月dd日", timezone = "GMT+8")
     private Date endTime;
 
+
     private String letterNo;
 
+    private Integer effectiveDays;
+
 
 }

soc-gateway/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-modules/soc-modules-api/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -75,7 +75,6 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 修改【请填写功能名称】
      */
     @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskRegistration.java

@@ -77,5 +77,6 @@ public class CoreMonitoringTaskRegistration extends BaseEntity {
      */
     @ApiModelProperty(value = "结束图片标识")
     private String endPicture;
-
+    @ApiModelProperty(value = "调阅时长")
+    private Double   averageDuration;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -83,7 +83,7 @@ public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreM
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("task_id", coreMonitoringTaskRegistration.getTaskId());
         queryWrapper.eq("del_flag", 0);
-        List<CoreMonitoringTaskRegistration>list = baseMapper.selectList(queryWrapper);
+        List<CoreMonitoringTaskRegistration> list = baseMapper.selectList(queryWrapper);
         if (CollectionUtils.isNotEmpty(list)) {
             if (StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndNfc()) && StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndPicture())) {
                 throw new ServiceException("请勿重复扫描");
@@ -91,6 +91,9 @@ public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreM
             CoreMonitoringTaskRegistration coreMonitoringTaskRegistration1 = list.get(0);
             coreMonitoringTaskRegistration1.setEndPicture(coreMonitoringTaskRegistration.getEndPicture());
             coreMonitoringTaskRegistration1.setEndNfc(coreMonitoringTaskRegistration.getEndNfc());
+            Long time = DateUtils.getNowDate().getTime() - coreMonitoringTaskRegistration1.getTaskStartTime().getTime();
+            Double avg = (double) time / 1000 / 3600;
+            coreMonitoringTaskRegistration1.setAverageDuration(Double.valueOf(String.format("%.2f", avg)));
             return baseMapper.updateById(coreMonitoringTaskRegistration1);
         } else {
             coreMonitoringTaskRegistration.setCreateTime(DateUtils.getNowDate());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -242,15 +242,17 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         introduceLetter.setOrgId(sysOrg.getId());
         introduceLetter.setOrgPath(sysOrg.getPath());
         introduceLetter.setOrgName(sysOrg.getName());
-        if(ObjectUtil.isNotEmpty(coreIntroduceLetter.getRange())) {
-            introduceLetter.setStartTime(coreIntroduceLetter.getRange().get(0));
-            introduceLetter.setEndTime(coreIntroduceLetter.getRange().get(1));
-            introduceLetter.setEffectiveDays((int) ChronoUnit.DAYS.between(LocalDate.parse(coreIntroduceLetter.getRange().get(0).toString()),LocalDate.parse(coreIntroduceLetter.getRange().get(1).toString())));
-        }
-        else {
-            introduceLetter.setStartTime(coreIntroduceLetter.getStartTime());
-            introduceLetter.setEndTime(DateUtil.offsetDay(coreIntroduceLetter.getStartTime(),coreIntroduceLetter.getEffectiveDays()-1));
-        }
+        introduceLetter.setStartTime(coreIntroduceLetter.getStartTime());
+        introduceLetter.setEndTime(DateUtil.offsetDay(coreIntroduceLetter.getStartTime(),coreIntroduceLetter.getEffectiveDays()-1));
+//        if(ObjectUtil.isNotEmpty(coreIntroduceLetter.getRange())) {
+//            introduceLetter.setStartTime(coreIntroduceLetter.getRange().get(0));
+//            introduceLetter.setEndTime(coreIntroduceLetter.getRange().get(1));
+//            introduceLetter.setEffectiveDays((int) ChronoUnit.DAYS.between(LocalDate.parse(coreIntroduceLetter.getRange().get(0).toString()),LocalDate.parse(coreIntroduceLetter.getRange().get(1).toString())));
+//        }
+//        else {
+//            introduceLetter.setStartTime(coreIntroduceLetter.getStartTime());
+//            introduceLetter.setEndTime(DateUtil.offsetDay(coreIntroduceLetter.getStartTime(),coreIntroduceLetter.getEffectiveDays()-1));
+//        }
         //封装人员信息
         List<CoreIntroduceLetterUserAddDto> userAddVoList =coreIntroduceLetter.getUserInfos();
         List<CoreIntroduceLetterUser> userList = new ArrayList<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/mapper/MonitorAccessReportMapper.java

@@ -19,4 +19,11 @@ public interface MonitorAccessReportMapper {
     Integer selectNetworkNumberByPath(String orgPath);
 
     MonitoringAccessVO selectAll(MonitoringAccessDTO monitoringAccessDTO);
+
+    /**
+     * 平均调阅时长
+     * @param monitoringAccessDTO
+     * @return
+     */
+    String avg(MonitoringAccessDTO monitoringAccessDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -114,6 +114,8 @@ public static String getWeekStart(){
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
             monitoringAccessDTO.setOrgPath(s.getPath());
             MonitoringAccessVO monitoringAccessVO1 = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
+            String avg = monitorAccessReportMapper.avg(monitoringAccessDTO);
+            monitoringAccessVO.setDuration(avg);
             monitoringAccessVO.setNetworkNumber(integer);
             monitoringAccessVO.setAccessRate(monitoringAccessVO1.getAccessRate());
             monitoringAccessVO.setOrgName(s.getShortName());

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

@@ -52,7 +52,7 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
         } else {
             page = new Page<>();
         }
-        SysOrg org = orgService.selectOrgById(coreSafetyBook.getOrgId() != null ? coreSafetyBook.getOrgId() : SecurityUtils.getUserId(), SecurityConstants.INNER);
+        SysOrg org = orgService.selectOrgById(coreSafetyBook.getOrgId() != null ? coreSafetyBook.getOrgId() : SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
         if (org != null) {
             coreSafetyBook.setSelectOrgPath(org.getPath());
         }
@@ -76,9 +76,9 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
             coreSafetyBook.setCreateTime(new Date());
             coreSafetyBook.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
             coreSafetyBook.setCreateOrgId(SecurityUtils.getLoginUser().getOrgId());
-            Year year = Year.now();
-            int currentYear = year.getValue();
-            coreSafetyBook.setYear((long) currentYear);
+//            Year year = Year.now();
+//            int currentYear = year.getValue();
+//            coreSafetyBook.setYear((long) currentYear);
             baseMapper.insert(coreSafetyBook);
         }
         //处理签署信息

soc-modules/soc-modules-core/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -65,7 +65,7 @@
         <if test="(coreIntroduceLetter.type ==null  or coreIntroduceLetter.type =='') and !coreIntroduceLetter.getRequestFromWeb">
             and a.type in (2,3)
         </if>
-        <if test="coreIntroduceLetter.status != null  and coreIntroduceLetter.status != ''">
+        <if test="coreIntroduceLetter.status != null">
             and a.status = #{coreIntroduceLetter.status}
         </if>
         order by a.create_time DESC

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreOutInRecordMapper.xml

@@ -82,7 +82,8 @@
             l.letter_file,
             l.letter_file as letterFileStr,
             l.start_time,
-            l.end_time
+            l.end_time,
+            l.effective_days
         FROM
             core_out_in_record r
                 INNER JOIN sys_org o ON r.org_id=o.id

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/MonitorAccessReportMapper.xml

@@ -60,4 +60,20 @@
         </if>
 
     </select>
+    <select id="avg" resultType="java.lang.String">
+        SELECT
+        IFNULL( ROUND( SUM( a.average_duration )/ COUNT( a.id ), 2 ), 0 )
+        FROM
+            core_monitoring_task_registration a
+                LEFT JOIN core_monitoring_retrieval_task b ON a.task_id = b.id
+        WHERE
+            b.`status` = 2
+        <if test="orgPath != null  and orgPath != ''">
+            and     b.org_path like concat( #{orgPath}, '%')
+        </if>
+        <if test="startDate != null  and endDate != null">
+            AND b.start_time >= #{startDate} AND b.end_time &lt;= #{endDate}
+        </if>
+    </select>
+
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/SafetyInspectMapper.xml

@@ -71,12 +71,22 @@
                     IF
                         ( a.`status` = 3, 1, 0 )),0) AS realityInspectNumber,
             IFNULL( SUM( a.exception_count ), 0 ) AS pitfallNumber,
+        IFNULL(
+        IF
+        (
+        SUM(
+        IF
+        ( a.`status` = 3, 1, 0 ))= 0
+        OR COUNT( a.id )= 0,
+        '0%',
         CONCAT(
         ROUND(
         IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 ) / IFNULL( COUNT( a.id ), 0 )* 100,
         2
         ),
         '%'
+        )),
+        '0%'
         ) AS inspectRate
         FROM
         core_safety_task a

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

@@ -78,6 +78,9 @@
         <if test="info.year != null">
             and b.year=#{info.year}
         </if>
+        <if test="info.type != null">
+            and b.type=#{info.type}
+        </if>
         <if test="info.checkSub ==true">
             and o.path like concat(#{info.selectOrgPath},'%')
         </if>

soc-modules/soc-modules-file/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-modules/soc-modules-gen/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-modules/soc-modules-job/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-modules/soc-modules-sync/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-modules/soc-modules-system/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

soc-visual/soc-monitor/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
@@ -41,8 +41,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 30天 -->
+			<maxHistory>30</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>