修改出入管理定时任务

project_data/sql/0.0.3/quartz/quartz.sql

@@ -1,2 +1,7 @@
 DELETE from `sys_job` WHERE invoke_target='CoreResumptionTask.buildPdf';
 INSERT INTO `sys_job`(`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (211, '每日生成履职登记簿', 'DEFAULT', 'CoreResumptionTask.buildPdf', '1 1 23 * * ?', '1', '1', '0', '省联社账号', '2023-11-10 10:18:41', '', NULL);
+
+
+-- 出入申请逾期状态任务
+DELETE FROM `sys_job` where `job_name`='出入申请逾期状态任务';
+INSERT INTO `sys_job` (`job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('出入申请逾期状态任务', 'DEFAULT', 'CoreLetterTask.updateLetterStatus', '0 0 1 * * ?', '1', '1', '0', 'zlsls01', '2023-11-13 17:04:54', 'zlsls01', '2023-11-13 17:16:28');

project_data/sql/0.0.3/soc/soc.sql

@@ -928,3 +928,112 @@ delete from sys_dict_data where dict_type = 'duty_options';
 INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113001, '夜间值守方式', 'duty_options', '0', '超级管理员', '2023-11-13 12:00:27', '', NULL, '同楼 和 远程');
 INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231113008, 1, '远程中心值守', '1', 'duty_options', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 12:01:10', '', NULL, NULL);
 INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231113009, 2, '同楼异地值守', '2', 'duty_options', NULL, 'default', 'N', '0', '超级管理员', '2023-11-13 12:01:25', '', NULL, NULL);
+
+
+
+
+-- Web端 出入管理
+DELETE FROM sys_menu WHERE id IN(01712729517575520258);
+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 (01712729517575520258, '出入管理', 0, 100, 'Introduce', NULL, NULL, 1, 0, 'M', '0', '0', '', '1', 'client', NULL, '超级管理员', '2023-10-13 15:18:50', '超级管理员', '2023-10-13 15:25:27', '');
+
+-- 介绍信管理
+DELETE FROM sys_menu WHERE id IN(01712730072704237569,01722086291781177346,01722089558964723714,01722089643559641090,01722133971111796737);
+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 (01712730072704237569, '介绍信管理', 1712729517575520258, 1, 'core/letter', 'core/outIn/letter/index', NULL, 1, 0, 'C', '0', '0', 'core:letter:query', '1', 'color', NULL, '超级管理员', '2023-10-13 15:21:02', '超级管理员', '2023-11-13 18:36:53', '');
+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 (01722086291781177346, '新增', 1712730072704237569, 0, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:add', '1', NULL, NULL, 'zlsls01', '2023-11-08 10:59:25', '', 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 (01722089558964723714, '删除', 1712730072704237569, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:remove', '1', NULL, NULL, '超级管理员', '2023-11-08 11:12:00', '超级管理员', '2023-11-08 11:12: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 (01722089643559641090, '编辑', 1712730072704237569, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:edit', '1', NULL, NULL, '超级管理员', '2023-11-08 11:12:20', '超级管理员', '2023-11-08 11:13:05', '');
+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 (01722133971111796737, '查询', 1712730072704237569, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:letter:query', '1', NULL, NULL, '超级管理员', '2023-11-08 14:08:29', '', NULL, '');
+
+DELETE FROM `sys_role_menu` WHERE menu_id IN(01712730072704237569,01722086291781177346,01722089558964723714,01722089643559641090,01722133971111796737);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01712730072704237569);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01722086291781177346);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01722089558964723714);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01722089643559641090);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01722133971111796737);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01712730072704237569);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01722086291781177346);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01722089558964723714);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01722089643559641090);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01722133971111796737);
+
+-- 出入事项审批
+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 (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, '');
+
+DELETE FROM `sys_role_menu` WHERE menu_id IN(01722459057471643650,01722497238984318978,01722551208603836417);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01722459057471643650);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01722497238984318978);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01722551208603836417);
+
+-- 出入情况查询
+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 (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);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01722881657557610498);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01722881657557610498);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01722883092282208257);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01722883092282208257);
+
+
+-- 移动端 出入管理菜单
+DELETE FROM sys_menu WHERE id IN(01719176094776664066);
+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 (01719176094776664066, '来访', 0, 4, '‘’', NULL, NULL, 1, 0, 'M', '0', '0', '', '0', NULL, NULL, '超级管理员', '2023-10-31 10:14:56', '超级管理员', '2023-10-31 10:38:38', '');
+
+-- 出入人员登记
+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 (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, '');
+
+DELETE FROM `sys_role_menu` WHERE menu_id IN(01719180104111788033,01724016270912864258,01724016373870444545);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01719180104111788033);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724016270912864258);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724016373870444545);
+
+-- 出入事项审批
+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 (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);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01721714093297004546);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01724017039149973506);
+
+-- 出入事项申请
+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 (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, '');
+
+DELETE FROM `sys_role_menu` WHERE menu_id IN(01721714556507549698,01724017221941936130,01724017294985740290,01724017404872310786);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01721714556507549698);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724017221941936130);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724017294985740290);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724017404872310786);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/controller/CoreIntroduceLetterController.java

@@ -37,7 +37,7 @@ public class CoreIntroduceLetterController extends BaseController {
  * 查询介绍信列表
  */
 @ApiOperation(value = "查询CoreIntroduceLetter列表")
-@RequiresPermissions("core:letter:list")
+@RequiresPermissions("core:letter:query")
 @GetMapping("/list")
     public TableDataInfo<CoreIntroduceLetterVo> list(CoreIntroduceLetterRequestDto requestDto) {
 
@@ -57,7 +57,7 @@ public class CoreIntroduceLetterController extends BaseController {
      * 获取介绍信详细信息
      */
     @ApiOperation(value = "获取CoreIntroduceLetter详细信息")
-//    @RequiresPermissions("core:letter:query")
+    @RequiresPermissions("core:letter:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreIntroduceLetterService.selectCoreIntroduceLetterById(id));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/controller/CoreOutInRecordController.java

@@ -54,7 +54,7 @@ public class CoreOutInRecordController extends BaseController {
      * 新增人员出入登记
      */
     @ApiOperation(value = "新增CoreOutInRecord")
-//    @RequiresPermissions("core:record:add")
+    @RequiresPermissions("core:record:add")
     @Log(title = "人员出入登记" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreOutInRecord coreOutInRecord) {

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

@@ -1,7 +1,9 @@
 package com.xunmei.core.letter.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -328,6 +330,25 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
      */
     @Override
     public void timedTaskUpdateLetterStatus() {
-
+        final LambdaQueryWrapper<CoreIntroduceLetter> oqw = new LambdaQueryWrapper<CoreIntroduceLetter>();
+        oqw.ne(CoreIntroduceLetter::getStatus,2).eq(CoreIntroduceLetter::getDeleted,0);
+        List<CoreIntroduceLetter> coreIntroduceLetters = coreIntroduceLetterMapper.selectList(oqw);
+        List<CoreIntroduceLetter> overdueLettersList=new ArrayList<>();
+        if(ObjectUtil.isNotEmpty(coreIntroduceLetters))
+        {
+            Date currentDate =DateUtil.beginOfDay(new Date());
+
+            coreIntroduceLetters.stream().forEach(x->{
+                final int result = currentDate.compareTo(x.getEndTime());
+                if(result>0)
+                {
+                    x.setStatus(2);
+                    overdueLettersList.add(x);
+                }
+            });
+        }
+        if(ObjectUtil.isNotEmpty(overdueLettersList)){
+            saveOrUpdateBatch(overdueLettersList);
+        }
     }
 }

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

@@ -94,16 +94,10 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,
             </if>
-            <if test="userName != null">user_name,
-            </if>
-            <if test="companyName != null">company_name,
-            </if>
-            <if test="idCard != null">id_card,
-            </if>
-            <if test="imgFile != null">img_file,
-            </if>
             <if test="letterId != null">letter_id,
             </if>
+            <if test="letterUserId != null">letter_user_id,
+            </if>
             <if test="createBy != null">create_by,
             </if>
             <if test="createTime != null">create_time,
@@ -122,16 +116,10 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                     <if test="id != null">#{id},
                     </if>
-                    <if test="userName != null">#{userName},
-                    </if>
-                    <if test="companyName != null">#{companyName},
-                    </if>
-                    <if test="idCard != null">#{idCard},
-                    </if>
-                    <if test="imgFile != null">#{imgFile},
-                    </if>
                     <if test="letterId != null">#{letterId},
                     </if>
+                    <if test="letterUserId != null">#{letterUserId},
+                    </if>
                     <if test="createBy != null">#{createBy},
                     </if>
                     <if test="createTime != null">#{createTime},
@@ -152,48 +140,12 @@
     <update id="updateCoreOutInRecord" parameterType="com.xunmei.common.core.domain.letter.domain.CoreOutInRecord">
         update core_out_in_record
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="userName != null">user_name =
-                        #{userName},
-                    </if>
-                    <if test="companyName != null">company_name =
-                        #{companyName},
-                    </if>
-                    <if test="idCard != null">id_card =
-                        #{idCard},
-                    </if>
-                    <if test="imgFile != null">img_file =
-                        #{imgFile},
-                    </if>
-                    <if test="letterId != null">letter_id =
-                        #{letterId},
-                    </if>
-                    <if test="createBy != null">create_by =
-                        #{createBy},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
                     <if test="arrivalTime != null">arrival_time =
                         #{arrivalTime},
                     </if>
                     <if test="departureTime != null">departure_time =
                         #{departureTime},
                     </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-                    <if test="accompanyingPerson != null">accompanying_person =
-                        #{accompanyingPerson},
-                    </if>
-                    <if test="letterFile != null">letter_file =
-                        #{letterFile},
-                    </if>
-                    <if test="type != null">type =
-                        #{type},
-                    </if>
-                    <if test="checkImage != null">check_image =
-                        #{checkImage},
-                    </if>
         </trim>
         where id = #{id}
     </update>

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/CoreLetter.java

@@ -1,27 +0,0 @@
-package com.xunmei.job.task;
-
-import cn.hutool.core.lang.UUID;
-import com.alibaba.fastjson2.JSON;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.system.api.RemoteDrillService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-@Slf4j
-@Component("CoreLetter")
-public class CoreLetter {
-
-    @Autowired
-    RemoteDrillService remoteDrillService;
-
-
-    public void updateLetterStatus() {
-        String id = UUID.fastUUID().toString();
-        log.info("开始执行预案演练定时任务,处理未完成的数据的任务数据状态为 已逾期，当前任务 id:{}", id);
-        AjaxResult result = remoteDrillService.updateDrillTaskStatus();
-        log.info("执行预案演练定时任务结束....,处理未完成的数据的任务数据状态为 已逾期，当前任务 id:{},结果:{}", id, JSON.toJSONString(result));
-    }
-}

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/CoreLetterTask.java

@@ -0,0 +1,26 @@
+package com.xunmei.job.task;
+
+import cn.hutool.core.lang.UUID;
+import com.alibaba.fastjson2.JSON;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.R;
+import com.xunmei.system.api.RemoteLetterService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component("CoreLetterTask")
+public class CoreLetterTask {
+
+    @Autowired
+    RemoteLetterService remoteLetterService;
+
+
+    public void updateLetterStatus() {
+        String id = UUID.fastUUID().toString();
+        log.info("开始执行介绍信修改状态定时任务,超过出入申请有效期的数据状态修改为 已逾期，当前任务 id:{}", id);
+        R<Boolean> booleanR = remoteLetterService.updateLetterStatus(SecurityConstants.INNER);
+        log.info("执行介绍信修改状态定时任务,超过出入申请有效期的数据状态修改为 已逾期已结束，当前任务 id:{},结果:{}", id, JSON.toJSONString(booleanR));
+    }
+}